Merge with mastersetuptools-scm

1 files changed, 10 insertions, 1 deletions

diff --git a/setuptools/py26compat.py b/setuptools/py26compat.py
index 40cbb88e..5778cdf1 100644
--- a/setuptools/py26compat.py
+++ b/setuptools/py26compat.py
@@ -9,6 +9,7 @@ try:
 except ImportError:
     from urllib import splittag
 
+
 def strip_fragment(url):
     """
     In `Python 8280 <http://bugs.python.org/issue8280>`_, Python 2.7 and
@@ -18,5 +19,13 @@ def strip_fragment(url):
     url, fragment = splittag(url)
     return url
 
-if sys.version_info >= (2,7):
+
+if sys.version_info >= (2, 7):
     strip_fragment = lambda x: x
+
+
+try:
+    from importlib import import_module
+except ImportError:
+    def import_module(module_name):
+        return __import__(module_name, fromlist=['__name__'])