diff --git a/Python/makeopcodetargets.py b/Python/makeopcodetargets.py
--- a/Python/makeopcodetargets.py
+++ b/Python/makeopcodetargets.py
@@ -1,26 +1,26 @@
 #! /usr/bin/env python
 """Generate C code for the jump table of the threaded code interpreter
 (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 importlib.machinery
 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]))
+        os.path.dirname(os.path.dirname(__file__)), "Lib", modname + ".py")
+    return importlib.machinery.SourceFileLoader(modname, modpath).load_module()
 
 def write_contents(f):
     """Write C code contents to the target file object.
     """
     opcode = find_module("opcode")
     targets = ['_unknown_opcode'] * 256
     for opname, op in opcode.opmap.items():
         targets[op] = "TARGET_%s" % opname
@@ -31,13 +31,10 @@ def write_contents(f):
 
 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"
-    f = open(target, "w")
-    try:
+    with open(target, "w") as f:
         write_contents(f)
-    finally:
-        f.close()