summaryrefslogtreecommitdiff
path: root/pkg_resources/__init__.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2016-01-23 18:13:32 -0500
committerJason R. Coombs <jaraco@jaraco.com>2016-01-23 18:13:32 -0500
commite2f1814e0d3d8963cf3a1eb4dff6d400b58b4a52 (patch)
treeebbf48671f53d2e7688ef548035ffd0e1e56bb82 /pkg_resources/__init__.py
parent7372d185e72fda6c8ad3eea6c5faac61eae602c5 (diff)
downloadpython-setuptools-git-e2f1814e0d3d8963cf3a1eb4dff6d400b58b4a52.tar.gz
Invoke import on importlib.machinery directly. Access an attribute to force import in delayed-import environments. Fixes #487.
Diffstat (limited to 'pkg_resources/__init__.py')
-rw-r--r--pkg_resources/__init__.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 50b86cdb..3ecf4c64 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -60,10 +60,11 @@ except ImportError:
from os import open as os_open
from os.path import isdir, split
-# Avoid try/except due to potential problems with delayed import mechanisms.
-if sys.version_info >= (3, 3) and sys.implementation.name == "cpython":
+try:
import importlib.machinery as importlib_machinery
-else:
+ # access attribute to force import under delayed import mechanisms.
+ importlib_machinery.__name__
+except ImportError:
importlib_machinery = None
try: