[Python-checkins] r84127 - in python/branches/release27-maint: Lib/test/test_abc.py
benjamin.peterson
python-checkins at python.org
Tue Aug 17 03:10:45 CEST 2010
Author: benjamin.peterson
Date: Tue Aug 17 03:10:45 2010
New Revision: 84127
Log:
Merged revisions 84125 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r84125 | benjamin.peterson | 2010-08-16 20:07:53 -0500 (Mon, 16 Aug 2010) | 1 line
use assertTrue/assertFalse
........
Modified:
python/branches/release27-maint/ (props changed)
python/branches/release27-maint/Lib/test/test_abc.py
Modified: python/branches/release27-maint/Lib/test/test_abc.py
==============================================================================
--- python/branches/release27-maint/Lib/test/test_abc.py (original)
+++ python/branches/release27-maint/Lib/test/test_abc.py Tue Aug 17 03:10:45 2010
@@ -15,16 +15,16 @@
def test_abstractmethod_basics(self):
@abc.abstractmethod
def foo(self): pass
- self.assertEqual(foo.__isabstractmethod__, True)
+ self.assertTrue(foo.__isabstractmethod__)
def bar(self): pass
- self.assertEqual(hasattr(bar, "__isabstractmethod__"), False)
+ self.assertFalse(hasattr(bar, "__isabstractmethod__"))
def test_abstractproperty_basics(self):
@abc.abstractproperty
def foo(self): pass
- self.assertEqual(foo.__isabstractmethod__, True)
+ self.assertTrue(foo.__isabstractmethod__)
def bar(self): pass
- self.assertEqual(hasattr(bar, "__isabstractmethod__"), False)
+ self.assertFalse(hasattr(bar, "__isabstractmethod__"))
class C:
__metaclass__ = abc.ABCMeta
@@ -87,20 +87,20 @@
class B(object):
pass
b = B()
- self.assertEqual(issubclass(B, A), False)
- self.assertEqual(issubclass(B, (A,)), False)
+ self.assertFalse(issubclass(B, A))
+ self.assertFalse(issubclass(B, (A,)))
self.assertNotIsInstance(b, A)
self.assertNotIsInstance(b, (A,))
A.register(B)
- self.assertEqual(issubclass(B, A), True)
- self.assertEqual(issubclass(B, (A,)), True)
+ self.assertTrue(issubclass(B, A))
+ self.assertTrue(issubclass(B, (A,)))
self.assertIsInstance(b, A)
self.assertIsInstance(b, (A,))
class C(B):
pass
c = C()
- self.assertEqual(issubclass(C, A), True)
- self.assertEqual(issubclass(C, (A,)), True)
+ self.assertTrue(issubclass(C, A))
+ self.assertTrue(issubclass(C, (A,)))
self.assertIsInstance(c, A)
self.assertIsInstance(c, (A,))
@@ -110,11 +110,11 @@
class B(object):
pass
b = B()
- self.assertEqual(isinstance(b, A), False)
- self.assertEqual(isinstance(b, (A,)), False)
+ self.assertFalse(isinstance(b, A))
+ self.assertFalse(isinstance(b, (A,)))
A.register(B)
- self.assertEqual(isinstance(b, A), True)
- self.assertEqual(isinstance(b, (A,)), True)
+ self.assertTrue(isinstance(b, A))
+ self.assertTrue(isinstance(b, (A,)))
def test_registration_builtins(self):
class A:
@@ -122,15 +122,15 @@
A.register(int)
self.assertIsInstance(42, A)
self.assertIsInstance(42, (A,))
- self.assertEqual(issubclass(int, A), True)
- self.assertEqual(issubclass(int, (A,)), True)
+ self.assertTrue(issubclass(int, A))
+ self.assertTrue(issubclass(int, (A,)))
class B(A):
pass
B.register(basestring)
self.assertIsInstance("", A)
self.assertIsInstance("", (A,))
- self.assertEqual(issubclass(str, A), True)
- self.assertEqual(issubclass(str, (A,)), True)
+ self.assertTrue(issubclass(str, A))
+ self.assertTrue(issubclass(str, (A,)))
def test_registration_edge_cases(self):
class A:
More information about the Python-checkins
mailing list