linse/frappy
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

automatically register subclasses of AsynConn

Browse Source 
using __init_subclass__ method.

+ correct typo

Change-Id: I9a57c467efcd138651248f92fbf84195624e0b9a
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/27093
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
This commit is contained in:
zolliker 2021-11-10 13:21:44 +01:00
parent 47d09e9b08
commit ad7cfe4ea0
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
secop/lib/__init__.py
View File

@ -98,7 +98,7 @@ def clamp(_min, value, _max):
def get_class(spec): def get_class(spec):
"""loads a class given by string in dotted notaion (as python would do)""" """loads a class given by string in dotted notation (as python would do)"""
modname, classname = spec.rsplit('.', 1) modname, classname = spec.rsplit('.', 1)
if modname.startswith('secop'): if modname.startswith('secop'):
module = importlib.import_module(modname) module = importlib.import_module(modname)

16
secop/lib/asynconn.py
View File

@ -48,6 +48,7 @@ class ConnectionClosed(ConnectionError):
class AsynConn: class AsynConn:
timeout = 1 # inter byte timeout timeout = 1 # inter byte timeout
scheme = None
SCHEME_MAP = {} SCHEME_MAP = {}
connection = None # is not None, if connected connection = None # is not None, if connected
defaultport = None defaultport = None
@ -79,8 +80,10 @@ class AsynConn:
self.disconnect() self.disconnect()
@classmethod @classmethod
def register_scheme(cls, scheme): def __init_subclass__(cls):
cls.SCHEME_MAP[scheme] = cls """register subclass to scheme, if available"""
if cls.scheme:
cls.SCHEME_MAP[cls.scheme] = cls
def disconnect(self): def disconnect(self):
raise NotImplementedError raise NotImplementedError
@ -154,6 +157,8 @@ class AsynConn:
class AsynTcp(AsynConn): class AsynTcp(AsynConn):
scheme = 'tcp'
def __init__(self, uri, *args, **kwargs): def __init__(self, uri, *args, **kwargs):
super().__init__(uri, *args, **kwargs) super().__init__(uri, *args, **kwargs)
self.uri = uri self.uri = uri
@ -202,9 +207,6 @@ class AsynTcp(AsynConn):
raise ConnectionClosed() # marks end of connection raise ConnectionClosed() # marks end of connection
AsynTcp.register_scheme('tcp')
class AsynSerial(AsynConn): class AsynSerial(AsynConn):
"""a serial connection using pyserial """a serial connection using pyserial
@ -221,6 +223,7 @@ class AsynSerial(AsynConn):
and others (see documentation of serial.Serial) and others (see documentation of serial.Serial)
""" """
scheme = 'serial'
PARITY_NAMES = {name[0]: name for name in ['NONE', 'ODD', 'EVEN', 'MASK', 'SPACE']} PARITY_NAMES = {name[0]: name for name in ['NONE', 'ODD', 'EVEN', 'MASK', 'SPACE']}
def __init__(self, uri, *args, **kwargs): def __init__(self, uri, *args, **kwargs):
@ -282,6 +285,3 @@ class AsynSerial(AsynConn):
return self.connection.read(n) return self.connection.read(n)
data = self.connection.read(1) data = self.connection.read(1)
return data + self.connection.read(self.connection.in_waiting) return data + self.connection.read(self.connection.in_waiting)
AsynSerial.register_scheme('serial')