From df960682a5d2d224627c0aaad77279f749af70ba Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Sat, 15 Jun 2013 14:07:21 -0400 Subject: [PATCH] Issue #17177: Stop using imp with py_compile --- Lib/py_compile.py | 7 ++++--- Lib/test/test_py_compile.py | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Lib/py_compile.py b/Lib/py_compile.py index cee35a5b6b1..9919debca04 100644 --- a/Lib/py_compile.py +++ b/Lib/py_compile.py @@ -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 @@ def compile(file, cfile=None, dfile=None, doraise=False, optimize=-1): """ 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 --git a/Lib/test/test_py_compile.py b/Lib/test/test_py_compile.py index 9f341bdf8c0..2ad9c3a0002 100644 --- a/Lib/test/test_py_compile.py +++ b/Lib/test/test_py_compile.py @@ -1,4 +1,4 @@ -import imp +import importlib.util import os import py_compile import shutil @@ -14,7 +14,7 @@ class PyCompileTests(unittest.TestCase): 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