Fixed compatibility issues with unittest module and Python versions below 3.5.

jacobaustin123 · copybara-github · commit c1a0450c66e0 · 2020-10-29T11:44:59.000-07:00
PiperOrigin-RevId: 339713431
Change-Id: I80cb92f74a3958cde56ece04e393d1f2c079d86e
diff --git a/fire/__main__.py b/fire/__main__.py
@@ -42,7 +42,17 @@ def import_from_file_path(path):
   """Performs a module import given the filename."""
   module_name = os.path.basename(path)
 
-  if sys.version_info.major == 3:
+  if sys.version_info.major == 3 and sys.version_info.minor < 5:
+    loader = importlib.machinery.SourceFileLoader(
+        fullname=module_name,
+        path=path,
+    )
+    spec = importlib.util.spec_from_loader(loader.name, loader, origin=path)
+    module = importlib.util.module_from_spec(spec)
+    sys.modules[loader.name] = module
+    loader.exec_module(module)
+
+  elif sys.version_info.major == 3:
     from importlib import util  # pylint: disable=g-import-not-at-top
     spec = util.spec_from_file_location(module_name, path)
 
@@ -51,6 +61,7 @@ def import_from_file_path(path):
 
     module = util.module_from_spec(spec)
     spec.loader.exec_module(module)  # pytype: disable=attribute-error
+
   else:
     import imp  # pylint: disable=g-import-not-at-top
     module = imp.load_source(module_name, path)
diff --git a/fire/main_test.py b/fire/main_test.py
@@ -65,27 +65,29 @@ def testFileNameFailure(self):
   def testFileNameModuleDuplication(self):
     # Confirm that a file that masks a module still loads the module.
     with self.assertOutputMatches('gettempdir'):
-      file = self.create_tempfile('tempfile')
+      dirname = os.path.dirname(self.file.name)
+      with testutils.ChangeDirectory(dirname):
+        with open('tempfile', 'w'):
+          __main__.main([
+              '__main__.py',
+              'tempfile',
+          ])
 
-      with testutils.ChangeDirectory(os.path.dirname(file.full_path)):
-        __main__.main([
-            '__main__.py',
-            'tempfile',
-        ])
+        os.remove('tempfile')
 
   def testFileNameModuleFileFailure(self):
     # Confirm that an invalid file that masks a non-existent module fails.
-    with self.assertRaisesWithLiteralMatch(
-        ValueError, 'Fire can only be called on .py files.'):
-      file = self.create_tempfile('foobar')
-
-      with testutils.ChangeDirectory(os.path.dirname(file.full_path)):
-        assert os.path.exists('foobar')
-
-        __main__.main([
-            '__main__.py',
-            'foobar',
-        ])
+    with self.assertRaisesRegex(ValueError,
+                                r'Fire can only be called on \.py files\.'):
+      dirname = os.path.dirname(self.file.name)
+      with testutils.ChangeDirectory(dirname):
+        with open('foobar', 'w'):
+          __main__.main([
+              '__main__.py',
+              'foobar',
+          ])
+
+        os.remove('foobar')
 
 
 if __name__ == '__main__':
