mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-26 21:33:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merged revisions 84125 via svnmerge from

Browse source 
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
........
This commit is contained in:
Benjamin Peterson 2010-08-17 01:10:45 +00:00
parent 80f724fda4
commit 5d6026a202
1 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Lib/test/test_abc.py
View file

@ -15,16 +15,16 @@ class TestABC(unittest.TestCase):
def test_abstractmethod_basics(self): def test_abstractmethod_basics(self):
@abc.abstractmethod @abc.abstractmethod
def foo(self): pass def foo(self): pass
self.assertEqual(foo.__isabstractmethod__, True) self.assertTrue(foo.__isabstractmethod__)
def bar(self): pass def bar(self): pass
self.assertEqual(hasattr(bar, "__isabstractmethod__"), False) self.assertFalse(hasattr(bar, "__isabstractmethod__"))
def test_abstractproperty_basics(self): def test_abstractproperty_basics(self):
@abc.abstractproperty @abc.abstractproperty
def foo(self): pass def foo(self): pass
self.assertEqual(foo.__isabstractmethod__, True) self.assertTrue(foo.__isabstractmethod__)
def bar(self): pass def bar(self): pass
self.assertEqual(hasattr(bar, "__isabstractmethod__"), False) self.assertFalse(hasattr(bar, "__isabstractmethod__"))
class C: class C:
__metaclass__ = abc.ABCMeta __metaclass__ = abc.ABCMeta
@ -87,20 +87,20 @@ class TestABC(unittest.TestCase):
class B(object): class B(object):
pass pass
b = B() b = B()
self.assertEqual(issubclass(B, A), False) self.assertFalse(issubclass(B, A))
self.assertEqual(issubclass(B, (A,)), False) self.assertFalse(issubclass(B, (A,)))
self.assertNotIsInstance(b, A) self.assertNotIsInstance(b, A)
self.assertNotIsInstance(b, (A,)) self.assertNotIsInstance(b, (A,))
A.register(B) A.register(B)
self.assertEqual(issubclass(B, A), True) self.assertTrue(issubclass(B, A))
self.assertEqual(issubclass(B, (A,)), True) self.assertTrue(issubclass(B, (A,)))
self.assertIsInstance(b, A) self.assertIsInstance(b, A)
self.assertIsInstance(b, (A,)) self.assertIsInstance(b, (A,))
class C(B): class C(B):
pass pass
c = C() c = C()
self.assertEqual(issubclass(C, A), True) self.assertTrue(issubclass(C, A))
self.assertEqual(issubclass(C, (A,)), True) self.assertTrue(issubclass(C, (A,)))
self.assertIsInstance(c, A) self.assertIsInstance(c, A)
self.assertIsInstance(c, (A,)) self.assertIsInstance(c, (A,))
@ -110,11 +110,11 @@ class TestABC(unittest.TestCase):
class B(object): class B(object):
pass pass
b = B() b = B()
self.assertEqual(isinstance(b, A), False) self.assertFalse(isinstance(b, A))
self.assertEqual(isinstance(b, (A,)), False) self.assertFalse(isinstance(b, (A,)))
A.register(B) A.register(B)
self.assertEqual(isinstance(b, A), True) self.assertTrue(isinstance(b, A))
self.assertEqual(isinstance(b, (A,)), True) self.assertTrue(isinstance(b, (A,)))
def test_registration_builtins(self): def test_registration_builtins(self):
class A: class A:
@ -122,15 +122,15 @@ class TestABC(unittest.TestCase):
A.register(int) A.register(int)
self.assertIsInstance(42, A) self.assertIsInstance(42, A)
self.assertIsInstance(42, (A,)) self.assertIsInstance(42, (A,))
self.assertEqual(issubclass(int, A), True) self.assertTrue(issubclass(int, A))
self.assertEqual(issubclass(int, (A,)), True) self.assertTrue(issubclass(int, (A,)))
class B(A): class B(A):
pass pass
B.register(basestring) B.register(basestring)
self.assertIsInstance("", A) self.assertIsInstance("", A)
self.assertIsInstance("", (A,)) self.assertIsInstance("", (A,))
self.assertEqual(issubclass(str, A), True) self.assertTrue(issubclass(str, A))
self.assertEqual(issubclass(str, (A,)), True) self.assertTrue(issubclass(str, (A,)))
def test_registration_edge_cases(self): def test_registration_edge_cases(self):
class A: class A: