Skip to content

C
cpython
Kaydet (Commit) 330cc52c authored tarafından Brett Cannon's avatar Brett Cannon
Dosyalara gözat
Seçenekler

Delete merge markers

üst e2f6b799
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
Lib/test/test_imp.py
Dosyayı görüntüle @ 330cc52c
...@@ -275,7 +275,6 @@ class ImportTests(unittest.TestCase): ...@@ -275,7 +275,6 @@ class ImportTests(unittest.TestCase):
return return
imp.load_module(name, None, *found[1:]) imp.load_module(name, None, *found[1:])
<<<<<<< local
@unittest.skipIf(sys.dont_write_bytecode, @unittest.skipIf(sys.dont_write_bytecode,
"test meaningful only when writing bytecode") "test meaningful only when writing bytecode")
def test_bug7732(self): def test_bug7732(self):
...@@ -284,14 +283,13 @@ class ImportTests(unittest.TestCase): ...@@ -284,14 +283,13 @@ class ImportTests(unittest.TestCase):
os.mkdir(source) os.mkdir(source)
self.assertRaisesRegex(ImportError, '^No module', self.assertRaisesRegex(ImportError, '^No module',
imp.find_module, support.TESTFN, ["."]) imp.find_module, support.TESTFN, ["."])
=======
def test_multiple_calls_to_get_data(self): def test_multiple_calls_to_get_data(self):
# Issue #18755: make sure multiple calls to get_data() can succeed. # Issue #18755: make sure multiple calls to get_data() can succeed.
loader = imp._LoadSourceCompatibility('imp', imp.__file__, loader = imp._LoadSourceCompatibility('imp', imp.__file__,
open(imp.__file__)) open(imp.__file__))
loader.get_data(imp.__file__) # File should be closed loader.get_data(imp.__file__) # File should be closed
loader.get_data(imp.__file__) # Will need to create a newly opened file loader.get_data(imp.__file__) # Will need to create a newly opened file
>>>>>>> other
class ReloadTests(unittest.TestCase): class ReloadTests(unittest.TestCase):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment