Fix imports for Python 2

2020-03-23 20:21:30 -07:00
parent 2ce5194156
commit 078685a2a3
36 changed files with 488 additions and 207 deletions
--- a/plexpy/logger.py
+++ b/plexpy/logger.py
@@ -34,8 +34,12 @@ import threading
 import traceback

 import plexpy
-from plexpy.helpers import is_public_ip
-from plexpy.config import _BLACKLIST_KEYS, _WHITELIST_KEYS
+if plexpy.PYTHON_VERSION < 3:
+    from helpers import is_public_ip
+    from config import _BLACKLIST_KEYS, _WHITELIST_KEYS
+else:
+    from plexpy.helpers import is_public_ip
+    from plexpy.config import _BLACKLIST_KEYS, _WHITELIST_KEYS


 # These settings are for file logging only