Merge pull request #16 from ericdill/fix-circular-import

Fix circular import while preserving backwards compatibility

Author: ocefpaf

stdlib_list/__init__.py

@@ -1,24 +1,4 @@
 from ._version import __version__
 
-
-import os
-
-base_dir = os.path.dirname(os.path.realpath(__file__))
-list_dir = os.path.join(base_dir, "lists")
-
-long_versions = ["2.6.9", "2.7.9", "3.2.6", "3.3.6", "3.4.3", "3.5", "3.6"]
-
-short_versions = [".".join(x.split(".")[:2]) for x in long_versions]
-
-
-def get_canonical_version(version):
-
-    if version in long_versions:
-        version = ".".join(version.split(".")[:2])
-    elif version not in short_versions:
-        raise ValueError("No such version: {}".format(version))
-
-    return version
-
-
-from .base import stdlib_list
+# Import all the things that used to be in here for backwards-compatibility reasons
+from .base import stdlib_list, get_canonical_version, short_versions, long_versions, base_dir, list_dir

stdlib_list/base.py

@@ -3,7 +3,23 @@
 import os
 import sys
 
-from . import get_canonical_version, list_dir
+base_dir = os.path.dirname(os.path.realpath(__file__))
+
+list_dir = os.path.join(base_dir, "lists")
+
+long_versions = ["2.6.9", "2.7.9", "3.2.6", "3.3.6", "3.4.3", "3.5", "3.6"]
+
+short_versions = [".".join(x.split(".")[:2]) for x in long_versions]
+
+
+def get_canonical_version(version):
+
+    if version in long_versions:
+        version = ".".join(version.split(".")[:2])
+    elif version not in short_versions:
+        raise ValueError("No such version: {}".format(version))
+
+    return version
 
 
 def stdlib_list(version=None):