changeset:   94945:6e736a57a482
parent:      94943:611fa301b807
parent:      94944:383ba3699084
user:        Serhiy Storchaka <storchaka@gmail.com>
date:        Wed Mar 11 17:31:33 2015 +0200
files:       Lib/tarfile.py Lib/tokenize.py Misc/NEWS
description:
Issue #23615: Modules bz2, tarfile and tokenize now can be reloaded with
imp.reload().  Patch by Thomas Kluyver.


diff -r 611fa301b807 -r 6e736a57a482 Lib/bz2.py
--- a/Lib/bz2.py	Wed Mar 11 08:17:00 2015 -0700
+++ b/Lib/bz2.py	Wed Mar 11 17:31:33 2015 +0200
@@ -9,6 +9,7 @@
 
 __author__ = "Nadeem Vawda <nadeem.vawda@gmail.com>"
 
+from builtins import open as _builtin_open
 import io
 import warnings
 
@@ -27,8 +28,6 @@
 
 _BUFFER_SIZE = 8192
 
-_builtin_open = open
-
 
 class BZ2File(io.BufferedIOBase):
 
diff -r 611fa301b807 -r 6e736a57a482 Lib/tarfile.py
--- a/Lib/tarfile.py	Wed Mar 11 08:17:00 2015 -0700
+++ b/Lib/tarfile.py	Wed Mar 11 17:31:33 2015 +0200
@@ -38,6 +38,7 @@
 #---------
 # Imports
 #---------
+from builtins import open as bltn_open
 import sys
 import os
 import io
@@ -2433,7 +2434,6 @@
     except TarError:
         return False
 
-bltn_open = open
 open = TarFile.open
 
 
diff -r 611fa301b807 -r 6e736a57a482 Lib/tokenize.py
--- a/Lib/tokenize.py	Wed Mar 11 08:17:00 2015 -0700
+++ b/Lib/tokenize.py	Wed Mar 11 17:31:33 2015 +0200
@@ -24,6 +24,7 @@
 __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 @@
     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 -r 611fa301b807 -r 6e736a57a482 Misc/NEWS
--- a/Misc/NEWS	Wed Mar 11 08:17:00 2015 -0700
+++ b/Misc/NEWS	Wed Mar 11 17:31:33 2015 +0200
@@ -16,6 +16,9 @@
 Library
 -------
 
+- Issue #23615: Modules bz2, tarfile and tokenize now can be reloaded with
+  imp.reload().  Patch by Thomas Kluyver.
+
 - Issue #23605: os.walk() now calls os.scandir() instead of os.listdir().
   The usage of os.scandir() reduces the number of calls to os.stat().
   Initial patch written by Ben Hoyt.
diff -r 611fa301b807 -r 6e736a57a482 Tools/freeze/bkfile.py
--- a/Tools/freeze/bkfile.py	Wed Mar 11 08:17:00 2015 -0700
+++ b/Tools/freeze/bkfile.py	Wed Mar 11 17:31:33 2015 +0200
@@ -1,4 +1,4 @@
-_orig_open = open
+from builtins import open as _orig_open
 
 class _BkFile:
     def __init__(self, file, mode, bufsize):