traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #17177: Stop using imp in zipfile

This commit is contained in:
Brett Cannon 2013-06-15 17:32:30 -04:00
parent 9529fbfd36
commit b57a085c74
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/test/test_zipfile.py
View File

@ -1,7 +1,7 @@
import io
import os
import sys
import imp
import importlib.util
import time
import shutil
import struct
@ -869,7 +869,7 @@ class PyZipFileTests(unittest.TestCase):
if os.altsep is not None:
path_split.extend(fn.split(os.altsep))
if '__pycache__' in path_split:
fn = imp.source_from_cache(fn)
fn = importlib.util.source_from_cache(fn)
else:
fn = fn[:-1]

6
Lib/zipfile.py
View File

@ -6,7 +6,7 @@ XXX references to utf-8 need further investigation.
import io
import os
import re
import imp
import importlib.util
import sys
import time
import stat
@ -1645,8 +1645,8 @@ class PyZipFile(ZipFile):
file_py = pathname + ".py"
file_pyc = pathname + ".pyc"
file_pyo = pathname + ".pyo"
pycache_pyc = imp.cache_from_source(file_py, True)
pycache_pyo = imp.cache_from_source(file_py, False)
pycache_pyc = importlib.util.cache_from_source(file_py, True)
pycache_pyo = importlib.util.cache_from_source(file_py, False)
if self._optimize == -1:
# legacy mode: use whatever file is present
if (os.path.isfile(file_pyo) and