fix secop.io imports
Change-Id: I8abe4836312cdd2d17847ca0a117dceebaaac235
This commit is contained in:
parent
73e06c590b
commit
584a293643
@ -25,7 +25,7 @@
|
|||||||
generic class for byte oriented communication
|
generic class for byte oriented communication
|
||||||
includes implementation for TCP and Serial connections
|
includes implementation for TCP and Serial connections
|
||||||
support for asynchronous communication, but may be used also for
|
support for asynchronous communication, but may be used also for
|
||||||
synchronous IO (see secop.stringio.StringIO)
|
synchronous IO (see secop.io)
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import ast
|
import ast
|
||||||
|
@ -29,7 +29,7 @@ from secop.lib import get_class
|
|||||||
from secop.modules import Drivable, Module, Readable, Writable
|
from secop.modules import Drivable, Module, Readable, Writable
|
||||||
from secop.params import Command, Parameter
|
from secop.params import Command, Parameter
|
||||||
from secop.properties import Property
|
from secop.properties import Property
|
||||||
from secop.stringio import HasIodev
|
from secop.io import HasIodev
|
||||||
|
|
||||||
|
|
||||||
class ProxyModule(HasIodev, Module):
|
class ProxyModule(HasIodev, Module):
|
||||||
|
@ -28,7 +28,7 @@ from secop.lib import formatStatusBits
|
|||||||
from secop.modules import Attached, Done, \
|
from secop.modules import Attached, Done, \
|
||||||
Drivable, Parameter, Property, Readable
|
Drivable, Parameter, Property, Readable
|
||||||
from secop.poller import REGULAR, Poller
|
from secop.poller import REGULAR, Poller
|
||||||
from secop.stringio import HasIodev
|
from secop.io import HasIodev
|
||||||
|
|
||||||
Status = Drivable.Status
|
Status = Drivable.Status
|
||||||
|
|
||||||
@ -53,7 +53,7 @@ scan = IOHandler('scan', 'SCAN?', '%d,%d')
|
|||||||
STATUS_BIT_LABELS = 'CS_OVL VCM_OVL VMIX_OVL VDIF_OVL R_OVER R_UNDER T_OVER T_UNDER'.split()
|
STATUS_BIT_LABELS = 'CS_OVL VCM_OVL VMIX_OVL VDIF_OVL R_OVER R_UNDER T_OVER T_UNDER'.split()
|
||||||
|
|
||||||
|
|
||||||
class StringIO(secop.stringio.StringIO):
|
class StringIO(secop.io.StringIO):
|
||||||
identification = [('*IDN?', 'LSCI,MODEL370,.*')]
|
identification = [('*IDN?', 'LSCI,MODEL370,.*')]
|
||||||
wait_before = 0.05
|
wait_before = 0.05
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@ from secop.lib.enum import Enum
|
|||||||
from secop.modules import Attached, Communicator, Done, \
|
from secop.modules import Attached, Communicator, Done, \
|
||||||
Drivable, Parameter, Property, Readable
|
Drivable, Parameter, Property, Readable
|
||||||
from secop.poller import Poller
|
from secop.poller import Poller
|
||||||
from secop.stringio import HasIodev
|
from secop.io import HasIodev
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import secop_psi.ppmswindows as ppmshw
|
import secop_psi.ppmswindows as ppmshw
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
|
|
||||||
from secop.datatypes import FloatRange, IntRange, StringType
|
from secop.datatypes import FloatRange, IntRange, StringType
|
||||||
from secop.modules import Drivable, Parameter, Readable
|
from secop.modules import Drivable, Parameter, Readable
|
||||||
from secop.stringio import HasIodev
|
from secop.io import HasIodev
|
||||||
|
|
||||||
Status = Drivable.Status
|
Status = Drivable.Status
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user