Move classmethod_ to init

nkpro2000sr · bessman · commit 62dd9e986b9b · 2021-08-19T17:33:02.000+02:00
diff --git a/pslab/bus/__init__.py b/pslab/bus/__init__.py
@@ -1,8 +1,26 @@
 """Contains modules for interfacing with the PSLab's I2C, SPI, and UART buses."""
 
-from pslab.bus.i2c import I2CMaster, I2CSlave
-from pslab.bus.spi import SPIMaster, SPISlave
-from pslab.bus.uart import UART
+import sys
+
+
+class classmethod_(classmethod):
+    """Support chaining classmethod and property."""
+
+    def __init__(self, f):
+        self.f = f
+        super().__init__(f)
+
+    def __get__(self, obj, cls=None):
+        # classmethod() to support chained decorators; new in python 3.9.
+        if sys.version_info < (3, 9) and isinstance(self.f, property):
+            return self.f.__get__(cls)
+        else:
+            return super().__get__(obj, cls)
+
+
+from pslab.bus.i2c import I2CMaster, I2CSlave  # noqa: E402
+from pslab.bus.spi import SPIMaster, SPISlave  # noqa: E402
+from pslab.bus.uart import UART  # noqa: E402
 
 __all__ = (
     "I2CMaster",
diff --git a/pslab/bus/spi.py b/pslab/bus/spi.py
@@ -19,10 +19,10 @@
 0
 """
 
-import sys
 from typing import List, Tuple
 
 import pslab.protocol as CP
+from pslab.bus import classmethod_
 from pslab.serial_handler import SerialHandler
 
 __all__ = (
@@ -38,21 +38,6 @@
 _SMP = 1
 
 
-class classmethod_(classmethod):
-    """Support chaining classmethod and property."""
-
-    def __init__(self, f):
-        self.f = f
-        super().__init__(f)
-
-    def __get__(self, obj, cls=None):
-        # classmethod() to support chained decorators; new in python 3.9.
-        if sys.version_info < (3, 9) and isinstance(self.f, property):
-            return self.f.__get__(cls)
-        else:
-            return super().__get__(obj, cls)
-
-
 class _SPIPrimitive:
     """SPI primitive commands.
 
diff --git a/pslab/bus/uart.py b/pslab/bus/uart.py
@@ -13,33 +13,17 @@
 >>> bus.write_byte(0x55)
 """
 
-import sys
 from typing import Tuple
 
 import pslab.protocol as CP
+from pslab.bus import classmethod_
 from pslab.serial_handler import SerialHandler
 
 __all__ = "UART"
 _BRGVAL = 0x22  # BaudRate = 460800.
 _MODE = (0, 0)  # 8-bit data and no parity, 1 stop bit.
 
 
-class classmethod_(classmethod):
-    """Support chaining classmethod and property."""
-
-    def __init__(self, f):
-        self.f = f
-        super().__init__(f)
-
-    def __get__(self, obj, cls=None):
-        """Check python version and return appropriate getter."""
-        # classmethod() to support chained decorators; new in python 3.9.
-        if sys.version_info < (3, 9) and isinstance(self.f, property):
-            return self.f.__get__(cls)
-        else:
-            return super().__get__(obj, cls)
-
-
 class _UARTPrimitive:
     """UART primitive commands.
 
