[Python-checkins] cpython: Issue #17177: Stop using imp in zipfile
brett.cannon
python-checkins at python.org
Sat Jun 15 23:33:38 CEST 2013
http://hg.python.org/cpython/rev/f96eb1dc335f
changeset: 84155:f96eb1dc335f
user: Brett Cannon <brett at python.org>
date: Sat Jun 15 17:32:30 2013 -0400
summary:
Issue #17177: Stop using imp in zipfile
files:
Lib/test/test_zipfile.py | 4 ++--
Lib/zipfile.py | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py
--- a/Lib/test/test_zipfile.py
+++ b/Lib/test/test_zipfile.py
@@ -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 @@
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]
diff --git a/Lib/zipfile.py b/Lib/zipfile.py
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -6,7 +6,7 @@
import io
import os
import re
-import imp
+import importlib.util
import sys
import time
import stat
@@ -1645,8 +1645,8 @@
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
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list