diff -r 3b94a4ef244e Lib/test/test_argparse.py --- a/Lib/test/test_argparse.py Fri Feb 07 17:53:13 2014 +0100 +++ b/Lib/test/test_argparse.py Fri Feb 07 22:34:13 2014 +0200 @@ -4219,7 +4219,7 @@ e = sys.exc_info()[1] expected = 'unknown action' msg = 'expected %r, found %r' % (expected, e) - self.assertTrue(expected in str(e), msg) + self.assertIn(expected, str(e), msg) def test_multiple_dest(self): parser = argparse.ArgumentParser() @@ -4230,7 +4230,7 @@ e = sys.exc_info()[1] expected = 'dest supplied twice for positional argument' msg = 'expected %r, found %r' % (expected, e) - self.assertTrue(expected in str(e), msg) + self.assertIn(expected, str(e), msg) def test_no_argument_actions(self): for action in ['store_const', 'store_true', 'store_false', diff -r 3b94a4ef244e Lib/test/test_optparse.py --- a/Lib/test/test_optparse.py Fri Feb 07 17:53:13 2014 +0100 +++ b/Lib/test/test_optparse.py Fri Feb 07 22:34:13 2014 +0200 @@ -370,10 +370,10 @@ self.assertTrue(self.parser.has_option("--verbose")) def assertTrueremoved(self): - self.assertTrue(self.parser.get_option("-v") is None) - self.assertTrue(self.parser.get_option("--verbose") is None) - self.assertTrue(self.parser.get_option("-n") is None) - self.assertTrue(self.parser.get_option("--noisy") is None) + self.assertIsNone(self.parser.get_option("-v")) + self.assertIsNone(self.parser.get_option("--verbose")) + self.assertIsNone(self.parser.get_option("-n")) + self.assertIsNone(self.parser.get_option("--noisy")) self.assertFalse(self.parser.has_option("-v")) self.assertFalse(self.parser.has_option("--verbose")) @@ -797,13 +797,13 @@ (options, args) = self.assertParseOK(["-q"], {'verbose': 0}, []) - self.assertTrue(options.verbose is False) + self.assertIs(options.verbose, False) def test_bool_true(self): (options, args) = self.assertParseOK(["-v"], {'verbose': 1}, []) - self.assertTrue(options.verbose is True) + self.assertIs(options.verbose, True) def test_bool_flicker_on_and_off(self): self.assertParseOK(["-qvq", "-q", "-v"], @@ -1105,15 +1105,15 @@ if opt == "-x": self.assertEqual(option._short_opts, ["-x"]) self.assertEqual(option._long_opts, []) - self.assertTrue(parser_ is self.parser) - self.assertTrue(value is None) + self.assertIs(parser_, self.parser) + self.assertIsNone(value) self.assertEqual(vars(parser_.values), {'filename': None}) parser_.values.x = 42 elif opt == "--file": self.assertEqual(option._short_opts, ["-f"]) self.assertEqual(option._long_opts, ["--file"]) - self.assertTrue(parser_ is self.parser) + self.assertIs(parser_, self.parser) self.assertEqual(value, "foo") self.assertEqual(vars(parser_.values), {'filename': None, 'x': 42}) @@ -1151,7 +1151,7 @@ def process_tuple(self, option, opt, value, parser_, len, type): self.assertEqual(len, 3) - self.assertTrue(type is int) + self.assertIs(type, int) if opt == "-p": self.assertEqual(value, "1,2,3") @@ -1242,7 +1242,7 @@ option_list=options) def variable_args(self, option, opt, value, parser): - self.assertTrue(value is None) + self.assertIsNone(value) value = [] rargs = parser.rargs while rargs: @@ -1333,8 +1333,8 @@ verbose_opt = self.parser.get_option("--verbose") version_opt = self.parser.get_option("--version") - self.assertTrue(v_opt is version_opt) - self.assertTrue(v_opt is not verbose_opt) + self.assertIs(v_opt, version_opt) + self.assertIsNot(v_opt, verbose_opt) self.assertEqual(v_opt._long_opts, ["--version"]) self.assertEqual(version_opt._short_opts, ["-v"]) self.assertEqual(version_opt._long_opts, ["--version"])