remove 'spdx' module from whitelist

poetry/core/spdx/helpers.py

@@ -2,61 +2,66 @@
 import os
 
 from io import open
-from typing import TYPE_CHECKING
 from typing import Dict
 from typing import Optional
 
+from .license import License
 
-if TYPE_CHECKING:
-    from .license import License  # noqa
 
+_licenses: Optional[Dict[str, License]] = None
 
-_licenses: Optional[Dict[str, "License"]] = None
 
+def license_by_id(identifier: str) -> License:
 
-def license_by_id(identifier: str) -> "License":
-    from .license import License  # noqa
-
-    if _licenses is None:
-        load_licenses()
+    licenses = _lazy_load_licenses()
 
     id = identifier.lower()
 
-    if id not in _licenses:
+    if id not in licenses:
         if not identifier:
             raise ValueError("A license identifier is required")
 
         return License(identifier, identifier, False, False)
 
-    return _licenses[id]
+    return licenses[id]
 
 
-def load_licenses() -> None:
-    from .license import License  # noqa
+def _lazy_load_licenses() -> Dict[str, License]:
 
     global _licenses
 
-    _licenses = {}
+    if _licenses is None:
+        licenses = _load_licenses()
+        _licenses = licenses
+        return licenses
+    else:
+        return _licenses
+
+
+def _load_licenses() -> Dict[str, License]:
 
+    licenses = {}
     licenses_file = os.path.join(os.path.dirname(__file__), "data", "licenses.json")
 
     with open(licenses_file, encoding="utf-8") as f:
         data = json.loads(f.read())
 
     for name, license_info in data.items():
         license = License(name, license_info[0], license_info[1], license_info[2])
-        _licenses[name.lower()] = license
+        licenses[name.lower()] = license
 
         full_name = license_info[0].lower()
-        if full_name in _licenses:
-            existing_license = _licenses[full_name]
+        if full_name in licenses:
+            existing_license = licenses[full_name]
             if not existing_license.is_deprecated:
                 continue
 
-        _licenses[full_name] = license
+        licenses[full_name] = license
 
     # Add a Proprietary license for non-standard licenses
-    _licenses["proprietary"] = License("Proprietary", "Proprietary", False, False)
+    licenses["proprietary"] = License("Proprietary", "Proprietary", False, False)
+
+    return licenses
 
 
 if __name__ == "__main__":

poetry/core/spdx/updater.py

@@ -5,12 +5,7 @@
 from typing import Any
 from typing import Dict
 from typing import Optional
-
-
-try:
-    from urllib.request import urlopen
-except ImportError:
-    from urllib2 import urlopen
+from urllib.request import urlopen
 
 
 class Updater:

pyproject.toml

@@ -107,7 +107,7 @@ module = [
   'poetry.core.packages.*',
   'poetry.core.pyproject.*',
   'poetry.core.semver.*',
-  'poetry.core.spdx.*',
+  'poetry.core.vcs.*',
   'poetry.core.version.*',
 ]
 ignore_errors = true