diff -r 3b94a4ef244e Lib/test/mapping_tests.py --- a/Lib/test/mapping_tests.py Fri Feb 07 17:53:13 2014 +0100 +++ b/Lib/test/mapping_tests.py Fri Feb 07 22:15:17 2014 +0200 @@ -72,7 +72,8 @@ self.assertTrue(hasattr(iter, '__next__')) self.assertTrue(hasattr(iter, '__iter__')) x = list(iter) - self.assertTrue(set(x)==set(lst)==set(ref)) + self.assertEqual(set(x), set(lst)) + self.assertEqual(set(ref), set(lst)) check_iterandlist(iter(d.keys()), list(d.keys()), self.reference.keys()) check_iterandlist(iter(d), list(d.keys()), self.reference.keys()) @@ -133,10 +134,10 @@ self.assertEqual(self._empty_mapping(), self._empty_mapping()) def test_bool(self): - self.assertTrue(not self._empty_mapping()) + self.assertFalse(self._empty_mapping()) self.assertTrue(self.reference) - self.assertTrue(bool(self._empty_mapping()) is False) - self.assertTrue(bool(self.reference) is True) + self.assertIs(bool(self._empty_mapping()), False) + self.assertIs(bool(self.reference), True) def test_keys(self): d = self._empty_mapping() @@ -268,10 +269,10 @@ def test_get(self): d = self._empty_mapping() - self.assertTrue(d.get(list(self.other.keys())[0]) is None) + self.assertIsNone(d.get(list(self.other.keys())[0])) self.assertEqual(d.get(list(self.other.keys())[0], 3), 3) d = self.reference - self.assertTrue(d.get(list(self.other.keys())[0]) is None) + self.assertIsNone(d.get(list(self.other.keys())[0])) self.assertEqual(d.get(list(self.other.keys())[0], 3), 3) self.assertEqual(d.get(list(self.inmapping.keys())[0]), list(self.inmapping.values())[0]) @@ -304,15 +305,15 @@ class TestMappingProtocol(BasicTestMappingProtocol): def test_constructor(self): BasicTestMappingProtocol.test_constructor(self) - self.assertTrue(self._empty_mapping() is not self._empty_mapping()) + self.assertIsNot(self._empty_mapping(), self._empty_mapping()) self.assertEqual(self.type2test(x=1, y=2), {"x": 1, "y": 2}) def test_bool(self): BasicTestMappingProtocol.test_bool(self) - self.assertTrue(not self._empty_mapping()) + self.assertFalse(self._empty_mapping()) self.assertTrue(self._full_mapping({"x": "y"})) - self.assertTrue(bool(self._empty_mapping()) is False) - self.assertTrue(bool(self._full_mapping({"x": "y"})) is True) + self.assertIs(bool(self._empty_mapping()), False) + self.assertIs(bool(self._full_mapping({"x": "y"})), True) def test_keys(self): BasicTestMappingProtocol.test_keys(self) @@ -338,7 +339,7 @@ def test_contains(self): d = self._empty_mapping() self.assertNotIn('a', d) - self.assertTrue(not ('a' in d)) + self.assertFalse('a' in d) self.assertTrue('a' not in d) d = self._full_mapping({'a': 1, 'b': 2}) self.assertIn('a', d) @@ -422,7 +423,7 @@ def test_fromkeys(self): self.assertEqual(self.type2test.fromkeys('abc'), {'a':None, 'b':None, 'c':None}) d = self._empty_mapping() - self.assertTrue(not(d.fromkeys('abc') is d)) + self.assertIsNot(d.fromkeys('abc'), d) self.assertEqual(d.fromkeys('abc'), {'a':None, 'b':None, 'c':None}) self.assertEqual(d.fromkeys((4,5),0), {4:0, 5:0}) self.assertEqual(d.fromkeys([]), {}) @@ -433,9 +434,9 @@ class dictlike(self.type2test): pass self.assertEqual(dictlike.fromkeys('a'), {'a':None}) self.assertEqual(dictlike().fromkeys('a'), {'a':None}) - self.assertTrue(dictlike.fromkeys('a').__class__ is dictlike) - self.assertTrue(dictlike().fromkeys('a').__class__ is dictlike) - self.assertTrue(type(dictlike.fromkeys('a')) is dictlike) + self.assertIs(dictlike.fromkeys('a').__class__, dictlike) + self.assertIs(dictlike().fromkeys('a').__class__, dictlike) + self.assertIs(type(dictlike.fromkeys('a')), dictlike) class mydict(self.type2test): def __new__(cls): return collections.UserDict() @@ -477,10 +478,10 @@ def test_get(self): BasicTestMappingProtocol.test_get(self) d = self._empty_mapping() - self.assertTrue(d.get('c') is None) + self.assertIsNone(d.get('c')) self.assertEqual(d.get('c', 3), 3) d = self._full_mapping({'a' : 1, 'b' : 2}) - self.assertTrue(d.get('c') is None) + self.assertIsNone(d.get('c')) self.assertEqual(d.get('c', 3), 3) self.assertEqual(d.get('a'), 1) self.assertEqual(d.get('a', 3), 1) @@ -488,9 +489,9 @@ def test_setdefault(self): BasicTestMappingProtocol.test_setdefault(self) d = self._empty_mapping() - self.assertTrue(d.setdefault('key0') is None) + self.assertIsNone(d.setdefault('key0')) d.setdefault('key0', []) - self.assertTrue(d.setdefault('key0') is None) + self.assertIsNone(d.setdefault('key0')) d.setdefault('key', []).append(3) self.assertEqual(d['key'][0], 3) d.setdefault('key', []).append(4) @@ -516,9 +517,10 @@ self.assertEqual(va, int(ka)) kb, vb = tb = b.popitem() self.assertEqual(vb, int(kb)) - self.assertTrue(not(copymode < 0 and ta != tb)) - self.assertTrue(not a) - self.assertTrue(not b) + if copymode < 0: + self.assertEqual(ta, tb) + self.assertFalse(a) + self.assertFalse(b) def test_pop(self): BasicTestMappingProtocol.test_pop(self) diff -r 3b94a4ef244e Lib/test/test_collections.py --- a/Lib/test/test_collections.py Fri Feb 07 17:53:13 2014 +0100 +++ b/Lib/test/test_collections.py Fri Feb 07 22:15:17 2014 +0200 @@ -638,7 +638,7 @@ def __hash__(self): return self._hash() a, b = OneTwoThreeSet(), OneTwoThreeSet() - self.assertTrue(hash(a) == hash(b)) + self.assertEqual(hash(a), hash(b)) def test_MutableSet(self): self.assertIsInstance(set(), MutableSet) @@ -979,7 +979,7 @@ def test_invariant_for_the_in_operator(self): c = Counter(a=10, b=-2, c=0) for elem in c: - self.assertTrue(elem in c) + self.assertIn(elem, c) self.assertIn(elem, c) def test_multiset_operations(self): diff -r 3b94a4ef244e Lib/test/test_defaultdict.py --- a/Lib/test/test_defaultdict.py Fri Feb 07 17:53:13 2014 +0100 +++ b/Lib/test/test_defaultdict.py Fri Feb 07 22:15:17 2014 +0200 @@ -69,7 +69,7 @@ self.assertEqual(repr(d2), "defaultdict(, {12: 42})") def foo(): return 43 d3 = defaultdict(foo) - self.assertTrue(d3.default_factory is foo) + self.assertIs(d3.default_factory, foo) d3[13] self.assertEqual(repr(d3), "defaultdict(%s, {13: 43})" % repr(foo)) @@ -134,7 +134,7 @@ d2 = copy.deepcopy(d1) self.assertEqual(d2.default_factory, foobar) self.assertEqual(d2, d1) - self.assertTrue(d1[1] is not d2[1]) + self.assertIsNot(d1[1], d2[1]) d1.default_factory = list d2 = copy.deepcopy(d1) self.assertEqual(d2.default_factory, list) diff -r 3b94a4ef244e Lib/test/test_deque.py --- a/Lib/test/test_deque.py Fri Feb 07 17:53:13 2014 +0100 +++ b/Lib/test/test_deque.py Fri Feb 07 22:15:17 2014 +0200 @@ -244,7 +244,7 @@ d = deque(data[:i]) r = d.reverse() self.assertEqual(list(d), list(reversed(data[:i]))) - self.assertIs(r, None) + self.assertIsNone(r) d.reverse() self.assertEqual(list(d), data[:i]) self.assertRaises(TypeError, d.reverse, 1) # Arity is zero @@ -347,7 +347,7 @@ self.assertRaises(RuntimeError, d.remove, 'c') for x, y in zip(d, e): # verify that original order and values are retained. - self.assertTrue(x is y) + self.assertIs(x, y) # Handle evil mutator for match in (True, False): @@ -530,7 +530,7 @@ obj.x = iter(container) del obj, container gc.collect() - self.assertTrue(ref() is None, "Cycle was not collected") + self.assertIsNone(ref(), "Cycle was not collected") check_sizeof = support.check_sizeof diff -r 3b94a4ef244e Lib/test/test_dict.py --- a/Lib/test/test_dict.py Fri Feb 07 17:53:13 2014 +0100 +++ b/Lib/test/test_dict.py Fri Feb 07 22:15:17 2014 +0200 @@ -275,10 +275,10 @@ def test_get(self): d = {} - self.assertIs(d.get('c'), None) + self.assertIsNone(d.get('c')) self.assertEqual(d.get('c', 3), 3) d = {'a': 1, 'b': 2} - self.assertIs(d.get('c'), None) + self.assertIsNone(d.get('c')) self.assertEqual(d.get('c', 3), 3) self.assertEqual(d.get('a'), 1) self.assertEqual(d.get('a', 3), 1) @@ -288,9 +288,9 @@ def test_setdefault(self): # dict.setdefault() d = {} - self.assertIs(d.setdefault('key0'), None) + self.assertIsNone(d.setdefault('key0')) d.setdefault('key0', []) - self.assertIs(d.setdefault('key0'), None) + self.assertIsNone(d.setdefault('key0')) d.setdefault('key', []).append(3) self.assertEqual(d['key'][0], 3) d.setdefault('key', []).append(4) @@ -733,7 +733,7 @@ obj.x = iter(obj.v) del obj, container gc.collect() - self.assertIs(ref(), None, "Cycle was not collected") + self.assertIsNone(ref(), "Cycle was not collected") def _not_tracked(self, t): # Nested containers can take several collections to untrack @@ -864,7 +864,7 @@ # merely an object supporting the iterator protocol, yielding # the same objects as the original one. # self.assertEqual(type(itorg), type(it)) - self.assertTrue(isinstance(it, collections.abc.Iterator)) + self.assertIsInstance(it, collections.abc.Iterator) self.assertEqual(dict(it), data) it = pickle.loads(d) diff -r 3b94a4ef244e Lib/test/test_dictviews.py --- a/Lib/test/test_dictviews.py Fri Feb 07 17:53:13 2014 +0100 +++ b/Lib/test/test_dictviews.py Fri Feb 07 22:15:17 2014 +0200 @@ -74,16 +74,16 @@ self.assertIsInstance(repr(d), str) r = repr(d.items()) self.assertIsInstance(r, str) - self.assertTrue(r == "dict_items([('a', 'ABC'), (1, 10)])" or - r == "dict_items([(1, 10), ('a', 'ABC')])") + self.assertIn(r, ("dict_items([('a', 'ABC'), (1, 10)])", + "dict_items([(1, 10), ('a', 'ABC')])")) r = repr(d.keys()) self.assertIsInstance(r, str) - self.assertTrue(r == "dict_keys(['a', 1])" or - r == "dict_keys([1, 'a'])") + self.assertIn(r, ("dict_keys(['a', 1])", + "dict_keys([1, 'a'])")) r = repr(d.values()) self.assertIsInstance(r, str) - self.assertTrue(r == "dict_values(['ABC', 10])" or - r == "dict_values([10, 'ABC'])") + self.assertIn(r, ("dict_values(['ABC', 10])", + "dict_values([10, 'ABC'])")) def test_keys_set_operations(self): d1 = {'a': 1, 'b': 2} diff -r 3b94a4ef244e Lib/test/test_heapq.py --- a/Lib/test/test_heapq.py Fri Feb 07 17:53:13 2014 +0100 +++ b/Lib/test/test_heapq.py Fri Feb 07 22:15:17 2014 +0200 @@ -61,7 +61,7 @@ for pos, item in enumerate(heap): if pos: # pos 0 has no parent parentpos = (pos-1) >> 1 - self.assertTrue(heap[parentpos] <= item) + self.assertLessEqual(heap[parentpos], item) def test_heapify(self): for size in range(30): diff -r 3b94a4ef244e Lib/test/test_list.py --- a/Lib/test/test_list.py Fri Feb 07 17:53:13 2014 +0100 +++ b/Lib/test/test_list.py Fri Feb 07 22:15:17 2014 +0200 @@ -10,7 +10,7 @@ l0_3 = [0, 1, 2, 3] l0_3_bis = list(l0_3) self.assertEqual(l0_3, l0_3_bis) - self.assertTrue(l0_3 is not l0_3_bis) + self.assertIsNot(l0_3, l0_3_bis) self.assertEqual(list(()), []) self.assertEqual(list((0, 1, 2, 3)), [0, 1, 2, 3]) self.assertEqual(list(''), []) @@ -40,11 +40,11 @@ def test_truth(self): super().test_truth() - self.assertTrue(not []) + self.assertFalse([]) self.assertTrue([42]) def test_identity(self): - self.assertTrue([] is not []) + self.assertIsNot([], []) def test_len(self): super().test_len() diff -r 3b94a4ef244e Lib/test/test_queue.py --- a/Lib/test/test_queue.py Fri Feb 07 17:53:13 2014 +0100 +++ b/Lib/test/test_queue.py Fri Feb 07 22:15:17 2014 +0200 @@ -108,7 +108,7 @@ for i in range(QUEUE_SIZE-1): q.put(i) self.assertTrue(q.qsize(), "Queue should not be empty") - self.assertTrue(not qfull(q), "Queue should not be full") + self.assertFalse(qfull(q), "Queue should not be full") last = 2 * QUEUE_SIZE full = 3 * 2 * QUEUE_SIZE q.put(last) @@ -131,7 +131,7 @@ # Empty it for i in range(QUEUE_SIZE): q.get() - self.assertTrue(not q.qsize(), "Queue should be empty") + self.assertFalse(q.qsize(), "Queue should be empty") try: q.get(block=0) self.fail("Didn't appear to block with an empty queue") @@ -308,7 +308,7 @@ q.put("last") self.assertTrue(qfull(q), "Queue should be full") q.get() - self.assertTrue(not qfull(q), "Queue should not be full") + self.assertFalse(qfull(q), "Queue should not be full") q.put("last") self.assertTrue(qfull(q), "Queue should be full") # Test a blocking put @@ -316,7 +316,7 @@ # Empty it for i in range(QUEUE_SIZE): q.get() - self.assertTrue(not q.qsize(), "Queue should be empty") + self.assertFalse(q.qsize(), "Queue should be empty") q.put("first") q.fail_next_get = True try: @@ -333,7 +333,7 @@ pass self.assertTrue(q.qsize(), "Queue should not be empty") q.get() - self.assertTrue(not q.qsize(), "Queue should be empty") + self.assertFalse(q.qsize(), "Queue should be empty") q.fail_next_get = True try: self.do_exceptional_blocking_test(q.get, (), q.put, ('empty',), @@ -344,7 +344,7 @@ # put succeeded, but get failed. self.assertTrue(q.qsize(), "Queue should not be empty") q.get() - self.assertTrue(not q.qsize(), "Queue should be empty") + self.assertFalse(q.qsize(), "Queue should be empty") def test_failing_queue(self): # Test to make sure a queue is functioning correctly. diff -r 3b94a4ef244e Lib/test/test_set.py --- a/Lib/test/test_set.py Fri Feb 07 17:53:13 2014 +0100 +++ b/Lib/test/test_set.py Fri Feb 07 22:15:17 2014 +0200 @@ -243,7 +243,7 @@ # Set iterators unpickle as list iterators due to the # undefined order of set items. # self.assertEqual(type(itorg), type(it)) - self.assertTrue(isinstance(it, collections.abc.Iterator)) + self.assertIsInstance(it, collections.abc.Iterator) self.assertEqual(self.thetype(it), data) it = pickle.loads(d) @@ -359,7 +359,7 @@ obj.x = iter(container) del obj, container gc.collect() - self.assertTrue(ref() is None, "Cycle was not collected") + self.assertIsNone(ref(), "Cycle was not collected") class TestSet(TestJointOps, unittest.TestCase): thetype = set @@ -433,7 +433,7 @@ try: self.s.remove(key) except KeyError as e: - self.assertTrue(e.args[0] is key, + self.assertIs(e.args[0], key, "KeyError should be {0}, not {1}".format(key, e.args[0])) else: @@ -1492,7 +1492,7 @@ set_list = sorted(self.set, key=repr) self.assertEqual(len(dup_list), len(set_list)) for i in range(len(dup_list)): - self.assertTrue(dup_list[i] is set_list[i]) + self.assertIs(dup_list[i], set_list[i]) def test_deep_copy(self): dup = copy.deepcopy(self.set) diff -r 3b94a4ef244e Lib/test/test_structseq.py --- a/Lib/test/test_structseq.py Fri Feb 07 17:53:13 2014 +0100 +++ b/Lib/test/test_structseq.py Fri Feb 07 22:15:17 2014 +0200 @@ -70,11 +70,11 @@ t1 = time.gmtime() t2 = type(t1)(t1) self.assertEqual(t1, t2) - self.assertTrue(not (t1 < t2)) + self.assertFalse(t1 < t2) self.assertTrue(t1 <= t2) - self.assertTrue(not (t1 > t2)) + self.assertFalse(t1 > t2) self.assertTrue(t1 >= t2) - self.assertTrue(not (t1 != t2)) + self.assertFalse(t1 != t2) def test_fields(self): t = time.gmtime() diff -r 3b94a4ef244e Lib/test/test_tuple.py --- a/Lib/test/test_tuple.py Fri Feb 07 17:53:13 2014 +0100 +++ b/Lib/test/test_tuple.py Fri Feb 07 22:15:17 2014 +0200 @@ -12,7 +12,7 @@ self.assertEqual(tuple(), ()) t0_3 = (0, 1, 2, 3) t0_3_bis = tuple(t0_3) - self.assertTrue(t0_3 is t0_3_bis) + self.assertIs(t0_3, t0_3_bis) self.assertEqual(tuple([]), ()) self.assertEqual(tuple([0, 1, 2, 3]), (0, 1, 2, 3)) self.assertEqual(tuple(''), ()) @@ -20,7 +20,7 @@ def test_truth(self): super().test_truth() - self.assertTrue(not ()) + self.assertFalse(()) self.assertTrue((42, )) def test_len(self): @@ -34,14 +34,14 @@ u = (0, 1) u2 = u u += (2, 3) - self.assertTrue(u is not u2) + self.assertIsNot(u, u2) def test_imul(self): super().test_imul() u = (0, 1) u2 = u u *= 3 - self.assertTrue(u is not u2) + self.assertIsNot(u, u2) def test_tupleresizebug(self): # Check that a specific bug in _PyTuple_Resize() is squashed. @@ -72,7 +72,7 @@ inps = base + [(i, j) for i in base for j in xp] + \ [(i, j) for i in xp for j in base] + xp + list(zip(base)) collisions = len(inps) - len(set(map(hash, inps))) - self.assertTrue(collisions <= 15) + self.assertLessEqual(collisions, 15) def test_repr(self): l0 = tuple() diff -r 3b94a4ef244e Lib/test/test_userdict.py --- a/Lib/test/test_userdict.py Fri Feb 07 17:53:13 2014 +0100 +++ b/Lib/test/test_userdict.py Fri Feb 07 22:15:17 2014 +0200 @@ -38,7 +38,7 @@ self.assertEqual(collections.UserDict().fromkeys('one two'.split()), d4) self.assertEqual(collections.UserDict.fromkeys('one two'.split(), 1), d5) self.assertEqual(collections.UserDict().fromkeys('one two'.split(), 1), d5) - self.assertTrue(u1.fromkeys('one two'.split()) is not u1) + self.assertIsNot(u1.fromkeys('one two'.split()), u1) self.assertIsInstance(u1.fromkeys('one two'.split()), collections.UserDict) self.assertIsInstance(u2.fromkeys('one two'.split()), collections.UserDict)