Issue #23615: Modules bz2, tarfile and tokenize now can be reloaded with

imp.reload().  Patch by Thomas Kluyver.

diff --git a/Lib/bz2.py b/Lib/bz2.py
index 6f47bfaf6cae3a5825e5187a825bf89e56027e9f..6c5a60d619daf8af00a24e9d88bcc0bdb2191f38 100644 (file)
--- a/Lib/bz2.py
+++ b/Lib/bz2.py
@@ -9,6 +9,7 @@ __all__ = ["BZ2File", "BZ2Compressor", "BZ2Decompressor",
 
 __author__ = "Nadeem Vawda <nadeem.vawda@gmail.com>"
 
+from builtins import open as _builtin_open
 import io
 import warnings
 
@@ -27,8 +28,6 @@ _MODE_WRITE    = 3
 
 _BUFFER_SIZE = 8192
 
-_builtin_open = open
-
 
 class BZ2File(io.BufferedIOBase):
 

diff --git a/Lib/tarfile.py b/Lib/tarfile.py
index 37e4dcd0e9bb371180a5b1ff5f9e9e40270edf2c..f9e5c189a1c3d7b72aa53f321e3eafcbd6193097 100755 (executable)
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -38,6 +38,7 @@ __credits__ = "Gustavo Niemeyer, Niels Gust\u00e4bel, Richard Townsend."
 #---------
 # Imports
 #---------
+from builtins import open as bltn_open
 import sys
 import os
 import io
@@ -2421,7 +2422,6 @@ def is_tarfile(name):
     except TarError:
         return False
 
-bltn_open = open
 open = TarFile.open
 
 

diff --git a/Lib/tokenize.py b/Lib/tokenize.py
index 5b47ebd82120a8fe56437f8e7b7d88436280d321..ed4153cec66006226b94f38c03b2f645d243630c 100644 (file)
--- a/Lib/tokenize.py
+++ b/Lib/tokenize.py
@@ -24,6 +24,7 @@ __author__ = 'Ka-Ping Yee <ping@lfw.org>'
 __credits__ = ('GvR, ESR, Tim Peters, Thomas Wouters, Fred Drake, '
                'Skip Montanaro, Raymond Hettinger, Trent Nelson, '
                'Michael Foord')
+from builtins import open as _builtin_open
 from codecs import lookup, BOM_UTF8
 import collections
 from io import TextIOWrapper
@@ -429,8 +430,6 @@ def detect_encoding(readline):
     return default, [first, second]
 
 
-_builtin_open = open
-
 def open(filename):
     """Open a file in read only mode using the encoding detected by
     detect_encoding().

diff --git a/Misc/NEWS b/Misc/NEWS
index e52a480f9e2c24e155e58c5791b3ed61f263a659..a6073b8c43f711ba8664396fedb41edb119ff0e0 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -16,6 +16,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #23615: Modules bz2, tarfile and tokenize now can be reloaded with
+  imp.reload().  Patch by Thomas Kluyver.
+
 - Issue #23476: In the ssl module, enable OpenSSL's X509_V_FLAG_TRUSTED_FIRST
   flag on certificate stores when it is available.
 

diff --git a/Tools/freeze/bkfile.py b/Tools/freeze/bkfile.py
index 58246fa2ad98a7fa859e6c293ea85c18cbcc7662..6abacc9e0ed677f1830167e8cc66bb12d2836dcf 100644 (file)
--- a/Tools/freeze/bkfile.py
+++ b/Tools/freeze/bkfile.py
@@ -1,4 +1,4 @@
-_orig_open = open
+from builtins import open as _orig_open
 
 class _BkFile:
     def __init__(self, file, mode, bufsize):