(original) (raw)

changeset: 84147:91467f342977 user: Brett Cannon brett@python.org date: Sat Jun 15 14:07:21 2013 -0400 files: Lib/py_compile.py Lib/test/test_py_compile.py description: Issue #17177: Stop using imp with py_compile diff -r acca81736b69 -r 91467f342977 Lib/py_compile.py --- a/Lib/py_compile.py Sat Jun 15 13:38:07 2013 -0400 +++ b/Lib/py_compile.py Sat Jun 15 14:07:21 2013 -0400 @@ -3,9 +3,9 @@ This module has intimate knowledge of the format of .pyc files. """ -import imp import importlib._bootstrap import importlib.machinery +import importlib.util import os import os.path import sys @@ -105,9 +105,10 @@ """ if cfile is None: if optimize >= 0: - cfile = imp.cache_from_source(file, debug_override=not optimize) + cfile = importlib.util.cache_from_source(file, + debug_override=not optimize) else: - cfile = imp.cache_from_source(file) + cfile = importlib.util.cache_from_source(file) if os.path.islink(cfile): msg = ('{} is a symlink and will be changed into a regular file if ' 'import writes a byte-compiled file to it') diff -r acca81736b69 -r 91467f342977 Lib/test/test_py_compile.py --- a/Lib/test/test_py_compile.py Sat Jun 15 13:38:07 2013 -0400 +++ b/Lib/test/test_py_compile.py Sat Jun 15 14:07:21 2013 -0400 @@ -1,4 +1,4 @@ -import imp +import importlib.util import os import py_compile import shutil @@ -14,7 +14,7 @@ self.directory = tempfile.mkdtemp() self.source_path = os.path.join(self.directory, '_test.py') self.pyc_path = self.source_path + 'c' - self.cache_path = imp.cache_from_source(self.source_path) + self.cache_path = importlib.util.cache_from_source(self.source_path) self.cwd_drive = os.path.splitdrive(os.getcwd())[0] # In these tests we compute relative paths. When using Windows, the # current working directory path and the 'self.source_path' might be /brett@python.org