diff --git a/Lib/doctest.py b/Lib/doctest.py index c37ff9e651e..5565aab57f7 100644 --- a/Lib/doctest.py +++ b/Lib/doctest.py @@ -216,7 +216,8 @@ def _load_testfile(filename, package, module_relative): # get_data() opens files as 'rb', so one must do the equivalent # conversion as universal newlines would do. return file_contents.replace(os.linesep, '\n'), filename - return open(filename).read(), filename + with open(filename) as f: + return f.read(), filename # Use sys.stdout encoding for ouput. _encoding = getattr(sys.__stdout__, 'encoding', None) or 'utf-8' diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py index f8d8dec5ade..dc217779eef 100644 --- a/Lib/test/test_decimal.py +++ b/Lib/test/test_decimal.py @@ -224,14 +224,15 @@ class DecimalTest(unittest.TestCase): if skip_expected: raise unittest.SkipTest return - for line in open(file): - line = line.replace('\r\n', '').replace('\n', '') - #print line - try: - t = self.eval_line(line) - except DecimalException, exception: - #Exception raised where there shoudn't have been one. - self.fail('Exception "'+exception.__class__.__name__ + '" raised on line '+line) + with open(file) as f: + for line in f: + line = line.replace('\r\n', '').replace('\n', '') + #print line + try: + t = self.eval_line(line) + except DecimalException as exception: + #Exception raised where there shoudn't have been one. + self.fail('Exception "'+exception.__class__.__name__ + '" raised on line '+line) return diff --git a/Lib/test/test_modulefinder.py b/Lib/test/test_modulefinder.py index 8c76977e3b1..e71d1e0aeb6 100644 --- a/Lib/test/test_modulefinder.py +++ b/Lib/test/test_modulefinder.py @@ -211,11 +211,17 @@ def open_file(path): def create_package(source): ofi = None - for line in source.splitlines(): - if line.startswith(" ") or line.startswith("\t"): - ofi.write(line.strip() + "\n") - else: - ofi = open_file(os.path.join(TEST_DIR, line.strip())) + try: + for line in source.splitlines(): + if line.startswith(" ") or line.startswith("\t"): + ofi.write(line.strip() + "\n") + else: + if ofi: + ofi.close() + ofi = open_file(os.path.join(TEST_DIR, line.strip())) + finally: + if ofi: + ofi.close() class ModuleFinderTest(unittest.TestCase): def _do_test(self, info, report=False): diff --git a/Lib/test/test_multibytecodec.py b/Lib/test/test_multibytecodec.py index 95ca0ab288c..63c1e620b59 100644 --- a/Lib/test/test_multibytecodec.py +++ b/Lib/test/test_multibytecodec.py @@ -46,12 +46,9 @@ class Test_MultibyteCodec(unittest.TestCase): 'apple\x92ham\x93spam', 'test.cjktest') def test_codingspec(self): - try: - for enc in ALL_CJKENCODINGS: - print >> open(TESTFN, 'w'), '# coding:', enc - exec open(TESTFN) - finally: - os.unlink(TESTFN) + for enc in ALL_CJKENCODINGS: + code = '# coding: {}\n'.format(enc) + exec code def test_init_segfault(self): # bug #3305: this used to segfault diff --git a/Lib/test/test_multibytecodec_support.py b/Lib/test/test_multibytecodec_support.py index 9aa764a4485..0639032a2dd 100644 --- a/Lib/test/test_multibytecodec_support.py +++ b/Lib/test/test_multibytecodec_support.py @@ -252,7 +252,7 @@ class TestBase_Mapping(unittest.TestCase): def __init__(self, *args, **kw): unittest.TestCase.__init__(self, *args, **kw) try: - self.open_mapping_file() # test it to report the error early + self.open_mapping_file().close() # test it to report the error early except (IOError, HTTPException): self.skipTest("Could not retrieve "+self.mapfileurl) @@ -270,36 +270,38 @@ class TestBase_Mapping(unittest.TestCase): unichrs = lambda s: u''.join(_unichr(c) for c in s.split('+')) urt_wa = {} - for line in self.open_mapping_file(): - if not line: - break - data = line.split('#')[0].strip().split() - if len(data) != 2: - continue + with self.open_mapping_file() as f: + for line in f: + if not line: + break + data = line.split('#')[0].strip().split() + if len(data) != 2: + continue - csetval = eval(data[0]) - if csetval <= 0x7F: - csetch = chr(csetval & 0xff) - elif csetval >= 0x1000000: - csetch = chr(csetval >> 24) + chr((csetval >> 16) & 0xff) + \ - chr((csetval >> 8) & 0xff) + chr(csetval & 0xff) - elif csetval >= 0x10000: - csetch = chr(csetval >> 16) + \ - chr((csetval >> 8) & 0xff) + chr(csetval & 0xff) - elif csetval >= 0x100: - csetch = chr(csetval >> 8) + chr(csetval & 0xff) - else: - continue + csetval = eval(data[0]) + if csetval <= 0x7F: + csetch = chr(csetval & 0xff) + elif csetval >= 0x1000000: + csetch = chr(csetval >> 24) + chr((csetval >> 16) & 0xff) + \ + chr((csetval >> 8) & 0xff) + chr(csetval & 0xff) + elif csetval >= 0x10000: + csetch = chr(csetval >> 16) + \ + chr((csetval >> 8) & 0xff) + chr(csetval & 0xff) + elif csetval >= 0x100: + csetch = chr(csetval >> 8) + chr(csetval & 0xff) + else: + continue - unich = unichrs(data[1]) - if unich == u'\ufffd' or unich in urt_wa: - continue - urt_wa[unich] = csetch + unich = unichrs(data[1]) + if unich == u'\ufffd' or unich in urt_wa: + continue + urt_wa[unich] = csetch - self._testpoint(csetch, unich) + self._testpoint(csetch, unich) def _test_mapping_file_ucm(self): - ucmdata = self.open_mapping_file().read() + with self.open_mapping_file() as f: + ucmdata = f.read() uc = re.findall('', ucmdata) for uni, coded in uc: unich = unichr(int(uni, 16)) diff --git a/Lib/test/test_pipes.py b/Lib/test/test_pipes.py index 476bd7c6440..c8b8be106c2 100644 --- a/Lib/test/test_pipes.py +++ b/Lib/test/test_pipes.py @@ -23,17 +23,21 @@ class SimplePipeTests(unittest.TestCase): f = t.open(TESTFN, 'w') f.write('hello world #1') f.close() - self.assertEqual(open(TESTFN).read(), 'HELLO WORLD #1') + with open(TESTFN) as f: + self.assertEqual(f.read(), 'HELLO WORLD #1') def testSimplePipe2(self): - file(TESTFN, 'w').write('hello world #2') + with open(TESTFN, 'w') as f: + f.write('hello world #2') t = pipes.Template() t.append(s_command + ' < $IN > $OUT', pipes.FILEIN_FILEOUT) t.copy(TESTFN, TESTFN2) - self.assertEqual(open(TESTFN2).read(), 'HELLO WORLD #2') + with open(TESTFN2) as f: + self.assertEqual(f.read(), 'HELLO WORLD #2') def testSimplePipe3(self): - file(TESTFN, 'w').write('hello world #2') + with open(TESTFN, 'w') as f: + f.write('hello world #2') t = pipes.Template() t.append(s_command + ' < $IN', pipes.FILEIN_STDOUT) with t.open(TESTFN, 'r') as f: @@ -42,16 +46,20 @@ class SimplePipeTests(unittest.TestCase): def testEmptyPipeline1(self): # copy through empty pipe d = 'empty pipeline test COPY' - file(TESTFN, 'w').write(d) - file(TESTFN2, 'w').write('') + with open(TESTFN, 'w') as f: + f.write(d) + with open(TESTFN2, 'w') as f: + f.write('') t=pipes.Template() t.copy(TESTFN, TESTFN2) - self.assertEqual(open(TESTFN2).read(), d) + with open(TESTFN2) as f: + self.assertEqual(f.read(), d) def testEmptyPipeline2(self): # read through empty pipe d = 'empty pipeline test READ' - file(TESTFN, 'w').write(d) + with open(TESTFN, 'w') as f: + f.write(d) t=pipes.Template() with t.open(TESTFN, 'r') as f: self.assertEqual(f.read(), d) @@ -60,8 +68,10 @@ class SimplePipeTests(unittest.TestCase): # write through empty pipe d = 'empty pipeline test WRITE' t = pipes.Template() - t.open(TESTFN, 'w').write(d) - self.assertEqual(open(TESTFN).read(), d) + with t.open(TESTFN, 'w') as f: + f.write(d) + with open(TESTFN) as f: + self.assertEqual(f.read(), d) def testQuoting(self): safeunquoted = string.ascii_letters + string.digits + '@%_-+=:,./' diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py index d6839359bd7..648a2cda43f 100644 --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py @@ -277,7 +277,8 @@ class TestShutil(unittest.TestCase): os.link(src, dst) self.assertRaises(shutil.Error, shutil.copyfile, src, dst) - self.assertEqual(open(src,'r').read(), 'cheddar') + with open(src, 'r') as f: + self.assertEqual(f.read(), 'cheddar') os.remove(dst) # Using `src` here would mean we end up with a symlink pointing @@ -285,7 +286,8 @@ class TestShutil(unittest.TestCase): # TESTFN/cheese. os.symlink('cheese', dst) self.assertRaises(shutil.Error, shutil.copyfile, src, dst) - self.assertEqual(open(src,'r').read(), 'cheddar') + with open(src, 'r') as f: + self.assertEqual(f.read(), 'cheddar') os.remove(dst) finally: try: @@ -588,9 +590,11 @@ class TestMove(unittest.TestCase): pass def _check_move_file(self, src, dst, real_dst): - contents = open(src, "rb").read() + with open(src, "rb") as f: + contents = f.read() shutil.move(src, dst) - self.assertEqual(contents, open(real_dst, "rb").read()) + with open(real_dst, "rb") as f: + self.assertEqual(contents, f.read()) self.assertFalse(os.path.exists(src)) def _check_move_dir(self, src, dst, real_dst):