1 files changed, 30 insertions, 18 deletions

diff --git a/Python/makeopcodetargets.py b/Python/makeopcodetargets.py
index d9a085552f..023c9e6c9f 100755
--- a/Python/makeopcodetargets.py
+++ b/Python/makeopcodetargets.py
@@ -3,24 +3,34 @@
 (for compilers supporting computed gotos or "labels-as-values", such as gcc).
 """
 
-# This code should stay compatible with Python 2.3, at least while
-# some of the buildbots have Python 2.3 as their system Python.
-
-import imp
 import os
+import sys
 
 
-def find_module(modname):
-    """Finds and returns a module in the local dist/checkout.
-    """
-    modpath = os.path.join(
-        os.path.dirname(os.path.dirname(__file__)), "Lib")
-    return imp.load_module(modname, *imp.find_module(modname, [modpath]))
+try:
+    from importlib.machinery import SourceFileLoader
+except ImportError:
+    import imp
+
+    def find_module(modname):
+        """Finds and returns a module in the local dist/checkout.
+        """
+        modpath = os.path.join(
+            os.path.dirname(os.path.dirname(__file__)), "Lib")
+        return imp.load_module(modname, *imp.find_module(modname, [modpath]))
+else:
+    def find_module(modname):
+        """Finds and returns a module in the local dist/checkout.
+        """
+        modpath = os.path.join(
+            os.path.dirname(os.path.dirname(__file__)), "Lib", modname + ".py")
+        return SourceFileLoader(modname, modpath).load_module()
+
 
 def write_contents(f):
     """Write C code contents to the target file object.
     """
-    opcode = find_module("opcode")
+    opcode = find_module('opcode')
     targets = ['_unknown_opcode'] * 256
     for opname, op in opcode.opmap.items():
         targets[op] = "TARGET_%s" % opname
@@ -29,15 +39,17 @@ def write_contents(f):
     f.write("\n};\n")
 
 
-if __name__ == "__main__":
-    import sys
-    assert len(sys.argv) < 3, "Too many arguments"
+def main():
+    if len(sys.argv) >= 3:
+        sys.exit("Too many arguments")
     if len(sys.argv) == 2:
         target = sys.argv[1]
     else:
         target = "Python/opcode_targets.h"
-    f = open(target, "w")
-    try:
+    with open(target, "w") as f:
         write_contents(f)
-    finally:
-        f.close()
+    print("Jump table written into %s" % target)
+
+
+if __name__ == "__main__":
+    main()