Removed circular imports for python 3.4 - fixes #16

TD22057 · Dec 22, 2017 · 6eb6afe · 6eb6afe
1 parent 2d006bf
commit 6eb6afe
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/insteon_mqtt/handler/DeviceDbGet.py b/insteon_mqtt/handler/DeviceDbGet.py
@@ -4,7 +4,6 @@
 #
 #===========================================================================
 # pylint: disable=too-many-return-statements
-from .. import db
 from .. import log
 from .. import message as Msg
 from .Base import Base
@@ -54,6 +53,10 @@ def msg_received(self, protocol, msg):
           Msg.CONTINUE if we handled the message and expect more.
           Msg.FINISHED if we handled the message and are done.
         """
+        # Import here - at file scope this makes a circular import
+        # which is ok in Python>=3.5 but not 3.4.
+        from .. import db
+
         # Probably an echo back of our sent message.  See if the
         # message matches the address we sent to and assume it's the
         # ACK/NAK message.  These seem to be either extended or

diff --git a/insteon_mqtt/handler/ModemAllLink.py b/insteon_mqtt/handler/ModemAllLink.py
@@ -3,7 +3,6 @@
 # Modem all link mode handler.
 #
 #===========================================================================
-from .. import db
 from .. import log
 from .. import message as Msg
 from .Base import Base
@@ -85,6 +84,10 @@ def msg_received(self, protocol, msg):
           Msg.FINISHED if we handled the message and are done.
 
         """
+        # Import here - at file scope this makes a circular import
+        # which is ok in Python>=3.5 but not 3.4.
+        from .. import db
+
         # Message is an ACK of the all link activation.
         if isinstance(msg, Msg.OutAllLinkStart):
             # If we get a NAK, then an error occured.

diff --git a/insteon_mqtt/handler/ModemDbGet.py b/insteon_mqtt/handler/ModemDbGet.py
@@ -3,7 +3,6 @@
 # Modem get all link database handler.
 #
 #===========================================================================
-from .. import db
 from .. import log
 from .. import message as Msg
 from .Base import Base
@@ -53,6 +52,10 @@ def msg_received(self, protocol, msg):
           Msg.CONTINUE if we handled the message and expect more.
           Msg.FINISHED if we handled the message and are done.
         """
+        # Import here - at file scope this makes a circular import
+        # which is ok in Python>=3.5 but not 3.4.
+        from .. import db
+
         # Message is an ACK/NAK of the record request.
         if isinstance(msg, (Msg.OutAllLinkGetFirst, Msg.OutAllLinkGetNext)):
             # If we get a NAK, then there are no more db records.