Style updates for the #11670 solution after post-commit review by Ezio Melotti:

http://mail.python.org/pipermail/python-checkins/2011-April/104688.html

Thanks!
This commit is contained in:
Łukasz Langa 2011-04-28 12:02:05 +02:00
parent c20566cdf8
commit ba702daef9
2 changed files with 24 additions and 30 deletions

View file

@ -1316,7 +1316,7 @@ class FakeFile:
def readline_generator(f):
"""As advised in Doc/library/configparser.rst."""
line = f.readline()
while line != '':
while line:
yield line
line = f.readline()
@ -1327,8 +1327,8 @@ class ReadFileTestCase(unittest.TestCase):
parser = configparser.ConfigParser()
with open(file_path) as f:
parser.read_file(f)
self.assertTrue("Foo Bar" in parser)
self.assertTrue("foo" in parser["Foo Bar"])
self.assertIn("Foo Bar", parser)
self.assertIn("foo", parser["Foo Bar"])
self.assertEqual(parser["Foo Bar"]["foo"], "newbar")
def test_iterable(self):
@ -1337,8 +1337,8 @@ class ReadFileTestCase(unittest.TestCase):
foo=newbar""").strip().split('\n')
parser = configparser.ConfigParser()
parser.read_file(lines)
self.assertTrue("Foo Bar" in parser)
self.assertTrue("foo" in parser["Foo Bar"])
self.assertIn("Foo Bar", parser)
self.assertIn("foo", parser["Foo Bar"])
self.assertEqual(parser["Foo Bar"]["foo"], "newbar")
def test_readline_generator(self):
@ -1347,8 +1347,8 @@ class ReadFileTestCase(unittest.TestCase):
with self.assertRaises(TypeError):
parser.read_file(FakeFile())
parser.read_file(readline_generator(FakeFile()))
self.assertTrue("Foo Bar" in parser)
self.assertTrue("foo" in parser["Foo Bar"])
self.assertIn("Foo Bar", parser)
self.assertIn("foo", parser["Foo Bar"])
self.assertEqual(parser["Foo Bar"]["foo"], "newbar")