[Python-checkins] cpython (merge 3.3 -> default): merge for issue #18755

[brett.cannon]

http://hg.python.org/cpython/rev/7d30ecf5c916
changeset:   85339:7d30ecf5c916
parent:      85336:391f36ef461a
parent:      85337:ddd610cb65ef
user:        Brett Cannon <brett at python.org>
date:        Fri Aug 23 11:52:19 2013 -0400
summary:
  merge for issue #18755

files:
  Lib/imp.py           |  9 +++++++--
  Lib/test/test_imp.py |  9 +++++++++
  2 files changed, 16 insertions(+), 2 deletions(-)


diff --git a/Lib/imp.py b/Lib/imp.py
--- a/Lib/imp.py
+++ b/Lib/imp.py
@@ -140,13 +140,18 @@
     def get_data(self, path):
         """Gross hack to contort loader to deal w/ load_*()'s bad API."""
         if self.file and path == self.path:
-            with self.file:
+            if not self.file.closed:
+                file = self.file
+            else:
+                self.file = file = open(self.path, 'r')
+
+            with file:
                 # Technically should be returning bytes, but
                 # SourceLoader.get_code() just passed what is returned to
                 # compile() which can handle str. And converting to bytes would
                 # require figuring out the encoding to decode to and
                 # tokenize.detect_encoding() only accepts bytes.
-                return self.file.read()
+                return file.read()
         else:
             return super().get_data(path)
 
diff --git a/Lib/test/test_imp.py b/Lib/test/test_imp.py
--- a/Lib/test/test_imp.py
+++ b/Lib/test/test_imp.py
@@ -275,6 +275,7 @@
             return
         imp.load_module(name, None, *found[1:])
 
+<<<<<<< local
     @unittest.skipIf(sys.dont_write_bytecode,
         "test meaningful only when writing bytecode")
     def test_bug7732(self):
@@ -283,6 +284,14 @@
             os.mkdir(source)
             self.assertRaisesRegex(ImportError, '^No module',
                 imp.find_module, support.TESTFN, ["."])
+=======
+    def test_multiple_calls_to_get_data(self):
+        # Issue #18755: make sure multiple calls to get_data() can succeed.
+        loader = imp._LoadSourceCompatibility('imp', imp.__file__,
+                                              open(imp.__file__))
+        loader.get_data(imp.__file__)  # File should be closed
+        loader.get_data(imp.__file__)  # Will need to create a newly opened file
+>>>>>>> other
 
 
 class ReloadTests(unittest.TestCase):

-- 
Repository URL: http://hg.python.org/cpython