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!
diff --git a/Lib/test/test_cfgparser.py b/Lib/test/test_cfgparser.py
index 03e400d..299f37a 100644
--- a/Lib/test/test_cfgparser.py
+++ b/Lib/test/test_cfgparser.py
@@ -1316,7 +1316,7 @@
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 @@
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 @@
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 @@
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")