[Python-checkins] cpython: Issue #17177: Stop using imp in pydoc

Sat Jun 15 20:25:14 CEST 2013

http://hg.python.org/cpython/rev/81cf3d6e6756
changeset: 84148:81cf3d6e6756
user: Brett Cannon <brett at python.org>
date: Sat Jun 15 14:25:04 2013 -0400
summary:
 Issue #17177: Stop using imp in pydoc
files:
 Lib/pydoc.py | 9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Lib/pydoc.py b/Lib/pydoc.py
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -44,17 +44,16 @@
 """
 
 # Known bugs that can't be fixed here:
-# - imp.load_module() cannot be prevented from clobbering existing
-# loaded modules, so calling synopsis() on a binary module file
-# changes the contents of any existing module with the same name.
+# - synopsis() cannot be prevented from clobbering existing
+# loaded modules.
 # - If the __file__ attribute on a module is a relative path and
 # the current directory is changed with os.chdir(), an incorrect
 # path will be displayed.
 
 import builtins
-import imp
 import importlib._bootstrap
 import importlib.machinery
+import importlib.util
 import inspect
 import io
 import os
@@ -268,7 +267,7 @@
 
 def importfile(path):
 """Import a Python source file or compiled file given its path."""
- magic = imp.get_magic()
+ magic = importlib.util.MAGIC_NUMBER
 with open(path, 'rb') as file:
 is_bytecode = magic == file.read(len(magic))
 filename = os.path.basename(path)
-- 
Repository URL: http://hg.python.org/cpython
