From 584a2936439335e84521409f22619a58e36e64c1 Mon Sep 17 00:00:00 2001 From: Markus Zolliker Date: Tue, 27 Jul 2021 09:19:28 +0200 Subject: [PATCH] fix secop.io imports Change-Id: I8abe4836312cdd2d17847ca0a117dceebaaac235 --- secop/lib/asynconn.py | 2 +- secop/proxy.py | 2 +- secop_psi/ls370res.py | 4 ++-- secop_psi/ppms.py | 2 +- secop_psi/testtemp.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/secop/lib/asynconn.py b/secop/lib/asynconn.py index e19feb4..567f498 100644 --- a/secop/lib/asynconn.py +++ b/secop/lib/asynconn.py @@ -25,7 +25,7 @@ generic class for byte oriented communication includes implementation for TCP and Serial connections support for asynchronous communication, but may be used also for -synchronous IO (see secop.stringio.StringIO) +synchronous IO (see secop.io) """ import ast diff --git a/secop/proxy.py b/secop/proxy.py index 325091c..d4d3a2a 100644 --- a/secop/proxy.py +++ b/secop/proxy.py @@ -29,7 +29,7 @@ from secop.lib import get_class from secop.modules import Drivable, Module, Readable, Writable from secop.params import Command, Parameter from secop.properties import Property -from secop.stringio import HasIodev +from secop.io import HasIodev class ProxyModule(HasIodev, Module): diff --git a/secop_psi/ls370res.py b/secop_psi/ls370res.py index 0b73e9f..ca10cec 100644 --- a/secop_psi/ls370res.py +++ b/secop_psi/ls370res.py @@ -28,7 +28,7 @@ from secop.lib import formatStatusBits from secop.modules import Attached, Done, \ Drivable, Parameter, Property, Readable from secop.poller import REGULAR, Poller -from secop.stringio import HasIodev +from secop.io import HasIodev 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() -class StringIO(secop.stringio.StringIO): +class StringIO(secop.io.StringIO): identification = [('*IDN?', 'LSCI,MODEL370,.*')] wait_before = 0.05 diff --git a/secop_psi/ppms.py b/secop_psi/ppms.py index b5a2d5a..c5172bd 100644 --- a/secop_psi/ppms.py +++ b/secop_psi/ppms.py @@ -43,7 +43,7 @@ from secop.lib.enum import Enum from secop.modules import Attached, Communicator, Done, \ Drivable, Parameter, Property, Readable from secop.poller import Poller -from secop.stringio import HasIodev +from secop.io import HasIodev try: import secop_psi.ppmswindows as ppmshw diff --git a/secop_psi/testtemp.py b/secop_psi/testtemp.py index 212f968..304d135 100644 --- a/secop_psi/testtemp.py +++ b/secop_psi/testtemp.py @@ -22,7 +22,7 @@ from secop.datatypes import FloatRange, IntRange, StringType from secop.modules import Drivable, Parameter, Readable -from secop.stringio import HasIodev +from secop.io import HasIodev Status = Drivable.Status