1 files changed, 18 insertions, 30 deletions
diff --git a/Python/makeopcodetargets.py b/Python/makeopcodetargets.py
index 023c9e6c9f..d9a085552f 100755
--- a/Python/makeopcodetargets.py
+++ b/Python/makeopcodetargets.py
@@ -3,34 +3,24 @@
 (for compilers supporting computed gotos or "labels-as-values", such as gcc).
 """
 
-import os
-import sys
-
+# This code should stay compatible with Python 2.3, at least while
+# some of the buildbots have Python 2.3 as their system Python.
 
-try:
-    from importlib.machinery import SourceFileLoader
-except ImportError:
-    import imp
+import imp
+import os
 
-    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 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]))
 
 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
@@ -39,17 +29,15 @@ def write_contents(f):
     f.write("\n};\n")
 
 
-def main():
-    if len(sys.argv) >= 3:
-        sys.exit("Too many arguments")
+if __name__ == "__main__":
+    import sys
+    assert len(sys.argv) < 3, "Too many arguments"
     if len(sys.argv) == 2:
         target = sys.argv[1]
     else:
         target = "Python/opcode_targets.h"
-    with open(target, "w") as f:
+    f = open(target, "w")
+    try:
         write_contents(f)
-    print("Jump table written into %s" % target)
-
-
-if __name__ == "__main__":
-    main()
+    finally:
+        f.close()