1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 72979 via svnmerge from

Browse Source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72979 | philip.jenvey | 2009-05-27 22:58:44 -0700 (Wed, 27 May 2009) | 2 lines

  explicitly close files
........
This commit is contained in:
Philip Jenvey 2009-05-28 06:09:08 +00:00
parent 3d2dc35a28
commit a27c5bd2bd
3 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Lib/test/test_difflib.py
View File

@ -135,14 +135,13 @@ class TestSFpatches(unittest.TestCase):
k.make_table(f3.splitlines(True),t3.splitlines(True)), k.make_table(f3.splitlines(True),t3.splitlines(True)),
]) ])
actual = full.replace('</body>','\n%s\n</body>' % tables) actual = full.replace('</body>','\n%s\n</body>' % tables)
# temporarily uncomment next three lines to baseline this test
#f = open('test_difflib_expect.html','w')
#f.write(actual)
#f.close()
expect = open(findfile('test_difflib_expect.html')).read()
# temporarily uncomment next two lines to baseline this test
#with open('test_difflib_expect.html','w') as fp:
# fp.write(actual)
self.assertEqual(actual,expect) with open(findfile('test_difflib_expect.html')) as fp:
self.assertEqual(actual, fp.read())
def test_recursion_limit(self): def test_recursion_limit(self):
# Check if the problem described in patch #1413711 exists. # Check if the problem described in patch #1413711 exists.

3
Lib/test/test_inspect.py
View File

@ -175,7 +175,8 @@ class GetSourceBase(unittest.TestCase):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
unittest.TestCase.__init__(self, *args, **kwargs) unittest.TestCase.__init__(self, *args, **kwargs)
self.source = open(inspect.getsourcefile(self.fodderFile)).read() with open(inspect.getsourcefile(self.fodderFile)) as fp:
self.source = fp.read()
def sourcerange(self, top, bottom): def sourcerange(self, top, bottom):
lines = self.source.split("\n") lines = self.source.split("\n")

45
Lib/test/test_univnewlines.py
View File

@ -37,12 +37,11 @@ class TestGenericUnivNewlines(unittest.TestCase):
WRITEMODE = 'wb' WRITEMODE = 'wb'
def setUp(self): def setUp(self):
fp = self.open(support.TESTFN, self.WRITEMODE)
data = self.DATA data = self.DATA
if "b" in self.WRITEMODE: if "b" in self.WRITEMODE:
data = data.encode("ascii") data = data.encode("ascii")
fp.write(data) with self.open(support.TESTFN, self.WRITEMODE) as fp:
fp.close() fp.write(data)
def tearDown(self): def tearDown(self):
try: try:
@ -51,35 +50,35 @@ class TestGenericUnivNewlines(unittest.TestCase):
pass pass
def test_read(self): def test_read(self):
fp = self.open(support.TESTFN, self.READMODE) with self.open(support.TESTFN, self.READMODE) as fp:
data = fp.read() data = fp.read()
self.assertEqual(data, DATA_LF) self.assertEqual(data, DATA_LF)
self.assertEqual(repr(fp.newlines), repr(self.NEWLINE)) self.assertEqual(repr(fp.newlines), repr(self.NEWLINE))
def test_readlines(self): def test_readlines(self):
fp = self.open(support.TESTFN, self.READMODE) with self.open(support.TESTFN, self.READMODE) as fp:
data = fp.readlines() data = fp.readlines()
self.assertEqual(data, DATA_SPLIT) self.assertEqual(data, DATA_SPLIT)
self.assertEqual(repr(fp.newlines), repr(self.NEWLINE)) self.assertEqual(repr(fp.newlines), repr(self.NEWLINE))
def test_readline(self): def test_readline(self):
fp = self.open(support.TESTFN, self.READMODE) with self.open(support.TESTFN, self.READMODE) as fp:
data = [] data = []
d = fp.readline()
while d:
data.append(d)
d = fp.readline() d = fp.readline()
while d:
data.append(d)
d = fp.readline()
self.assertEqual(data, DATA_SPLIT) self.assertEqual(data, DATA_SPLIT)
self.assertEqual(repr(fp.newlines), repr(self.NEWLINE)) self.assertEqual(repr(fp.newlines), repr(self.NEWLINE))
def test_seek(self): def test_seek(self):
fp = self.open(support.TESTFN, self.READMODE) with self.open(support.TESTFN, self.READMODE) as fp:
fp.readline() fp.readline()
pos = fp.tell() pos = fp.tell()
data = fp.readlines() data = fp.readlines()
self.assertEqual(data, DATA_SPLIT[1:]) self.assertEqual(data, DATA_SPLIT[1:])
fp.seek(pos) fp.seek(pos)
data = fp.readlines() data = fp.readlines()
self.assertEqual(data, DATA_SPLIT[1:]) self.assertEqual(data, DATA_SPLIT[1:])
@ -96,10 +95,10 @@ class TestCRLFNewlines(TestGenericUnivNewlines):
DATA = DATA_CRLF DATA = DATA_CRLF
def test_tell(self): def test_tell(self):
fp = self.open(support.TESTFN, self.READMODE) with self.open(support.TESTFN, self.READMODE) as fp:
self.assertEqual(repr(fp.newlines), repr(None)) self.assertEqual(repr(fp.newlines), repr(None))
data = fp.readline() data = fp.readline()
pos = fp.tell() pos = fp.tell()
self.assertEqual(repr(fp.newlines), repr(self.NEWLINE)) self.assertEqual(repr(fp.newlines), repr(self.NEWLINE))
class TestMixedNewlines(TestGenericUnivNewlines): class TestMixedNewlines(TestGenericUnivNewlines):