summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2013-08-23 16:10:09 (GMT)
committerBrett Cannon <brett@python.org>2013-08-23 16:10:09 (GMT)
commit330cc52c99037eaabe0fcfa09f9b099743b0b913 (patch)
tree8a4ef3fef2469e4fa2e5f9fbdd0567571fa1f8da /Lib
parente2f6b799b81162cdefb0f3293212f8fa47f49713 (diff)
downloadcpython-330cc52c99037eaabe0fcfa09f9b099743b0b913.zip
cpython-330cc52c99037eaabe0fcfa09f9b099743b0b913.tar.gz
cpython-330cc52c99037eaabe0fcfa09f9b099743b0b913.tar.bz2
Delete merge markers
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_imp.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/Lib/test/test_imp.py b/Lib/test/test_imp.py
index 586a97c..cf27a71 100644
--- a/Lib/test/test_imp.py
+++ b/Lib/test/test_imp.py
@@ -275,7 +275,6 @@ 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):
@@ -284,14 +283,13 @@ 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):