Fix for environments where Crypto and pyaes are installed. (mjg59#151)

marconfus · mjg59 · commit 26109aac67dc · 2018-03-18T14:54:17.000-07:00
If both Crypto and pyaes are installed 'pyaes' is in sys.modules(), but as it is not imported (see top) it's not available. Fix for mjg59#128
diff --git a/broadlink/__init__.py b/broadlink/__init__.py
@@ -167,7 +167,7 @@ def __init__(self, host, mac, timeout=10):
     self.type = "Unknown"
     self.lock = threading.Lock()
 
-    if 'pyaes' in sys.modules:
+    if 'pyaes' in globals():
         self.encrypt = self.encrypt_pyaes
         self.decrypt = self.decrypt_pyaes
     else:
