RF: use importlib for importing + style change

matthew-brett · matthew-brett · commit 677801a3b0c7 · 2016-11-29T14:53:43.000-08:00
Use importlib to test module import.

Put 'and' at end of line instead of beginning.
diff --git a/setup.py b/setup.py
@@ -193,9 +193,9 @@ def run(self):
                     required_failed.append(package)
             else:
                 good_packages.append(package)
-                if (isinstance(package, setupext.OptionalBackendPackage)
-                        and package.runtime_check()
-                        and default_backend is None):
+                if (isinstance(package, setupext.OptionalBackendPackage) and
+                        package.runtime_check() and
+                        default_backend is None):
                     default_backend = package.name
     print_raw('')
 
diff --git a/setupext.py b/setupext.py
@@ -1,5 +1,7 @@
 from __future__ import print_function, absolute_import
 
+from importlib import import_module
+
 from distutils import sysconfig
 from distutils import version
 from distutils.core import Extension
@@ -1655,7 +1657,7 @@ def runtime_check(self):
         """
         pkg_name = 'tkinter' if PY3min else 'Tkinter'
         try:
-            __import__(pkg_name)
+            import_module(pkg_name)
         except ImportError:
             return False
         return True
