Merged in svetlyak40wt/setuptools/svetlyak40wt/make-194-same-level-header-as-other-vers-1453106898145 (pull request #171)

Make 19.4 same level header as other version numbers.

2 files changed, 11 insertions, 3 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 5242f731..c7f68ab4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+19.4.1
+------
+
+* Issue #487: Use direct invocation of ``importlib.machinery``
+  in ``pkg_resources`` to avoid missing detection on relevant
+  platforms.
+
 19.4
 ----
 
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: