mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-22 01:35:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Fix deprecation warnings in test_file.py

Browse source
This commit is contained in:
Ezio Melotti 2010-08-03 07:17:20 +00:00
parent cd37dd8e05
commit dfe2107481
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Lib/test/test_file.py
View file

@ -34,13 +34,16 @@ class AutoFileTests(unittest.TestCase):
def testAttributes(self): def testAttributes(self):
# verify expected attributes exist # verify expected attributes exist
f = self.f f = self.f
softspace = f.softspace
f.name # merely shouldn't blow up f.name # merely shouldn't blow up
f.mode # ditto f.mode # ditto
f.closed # ditto f.closed # ditto
# verify softspace is writable with test_support._check_py3k_warnings(
f.softspace = softspace # merely shouldn't blow up ('file.softspace not supported in 3.x', DeprecationWarning)):
softspace = f.softspace
# verify softspace is writable
f.softspace = softspace # merely shouldn't blow up
# verify the others aren't # verify the others aren't
for attr in 'name', 'mode', 'closed': for attr in 'name', 'mode', 'closed':
@ -111,7 +114,8 @@ class AutoFileTests(unittest.TestCase):
for methodname in methods: for methodname in methods:
method = getattr(self.f, methodname) method = getattr(self.f, methodname)
# should raise on closed file # should raise on closed file
self.assertRaises(ValueError, method) with test_support._check_py3k_warnings(quiet=True):
self.assertRaises(ValueError, method)
self.assertRaises(ValueError, self.f.writelines, []) self.assertRaises(ValueError, self.f.writelines, [])
# file is closed, __exit__ shouldn't do anything # file is closed, __exit__ shouldn't do anything
@ -218,7 +222,7 @@ class OtherFileTests(unittest.TestCase):
try: try:
f = open(TESTFN, bad_mode) f = open(TESTFN, bad_mode)
except ValueError, msg: except ValueError, msg:
if msg[0] != 0: if msg.args[0] != 0:
s = str(msg) s = str(msg)
if TESTFN in s or bad_mode not in s: if TESTFN in s or bad_mode not in s:
self.fail("bad error message for invalid mode: %s" % s) self.fail("bad error message for invalid mode: %s" % s)