summaryrefslogtreecommitdiff
path: root/Lib/test/test_imp.py
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/test/test_imp.py')
-rw-r--r--Lib/test/test_imp.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/Lib/test/test_imp.py b/Lib/test/test_imp.py
index 8eb56f6c05..586a97c553 100644
--- a/Lib/test/test_imp.py
+++ b/Lib/test/test_imp.py
@@ -275,6 +275,7 @@ class ImportTests(unittest.TestCase):
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 @@ class ImportTests(unittest.TestCase):
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):