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

Merged revisions 84125-84126 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
........
  r84126 | benjamin.peterson | 2010-08-16 20:08:46 -0500 (Mon, 16 Aug 2010) | 1 line

  remove test for oldstyle classes
........
This commit is contained in:
Benjamin Peterson 2010-08-17 01:14:01 +00:00
parent 2760a66b69
commit 14c61237e5
1 changed files with 20 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

48
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(metaclass=abc.ABCMeta): class C(metaclass=abc.ABCMeta):
@abc.abstractproperty @abc.abstractproperty
@ -60,34 +60,26 @@ class TestABC(unittest.TestCase):
self.assertRaises(TypeError, F) # because bar is abstract now self.assertRaises(TypeError, F) # because bar is abstract now
self.assertTrue(isabstract(F)) self.assertTrue(isabstract(F))
def test_subclass_oldstyle_class(self):
class A:
__metaclass__ = abc.ABCMeta
class OldstyleClass:
pass
self.assertFalse(issubclass(OldstyleClass, A))
self.assertFalse(issubclass(A, OldstyleClass))
def test_registration_basics(self): def test_registration_basics(self):
class A(metaclass=abc.ABCMeta): class A(metaclass=abc.ABCMeta):
pass pass
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.assertEqual(isinstance(b, A), False) self.assertEqual(isinstance(b, A), False)
self.assertEqual(isinstance(b, (A,)), False) self.assertEqual(isinstance(b, (A,)), False)
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.assertEqual(isinstance(b, A), True) self.assertEqual(isinstance(b, A), True)
self.assertEqual(isinstance(b, (A,)), True) self.assertEqual(isinstance(b, (A,)), True)
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.assertEqual(isinstance(c, A), True) self.assertEqual(isinstance(c, A), True)
self.assertEqual(isinstance(c, (A,)), True) self.assertEqual(isinstance(c, (A,)), True)
@ -97,11 +89,11 @@ class TestABC(unittest.TestCase):
class B: class B:
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(metaclass=abc.ABCMeta): class A(metaclass=abc.ABCMeta):
@ -109,18 +101,18 @@ class TestABC(unittest.TestCase):
A.register(int) A.register(int)
self.assertEqual(isinstance(42, A), True) self.assertEqual(isinstance(42, A), True)
self.assertEqual(isinstance(42, (A,)), True) self.assertEqual(isinstance(42, (A,)), True)
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(str) B.register(str)
class C(str): pass class C(str): pass
self.assertEqual(isinstance("", A), True) self.assertEqual(isinstance("", A), True)
self.assertEqual(isinstance("", (A,)), True) self.assertEqual(isinstance("", (A,)), True)
self.assertEqual(issubclass(str, A), True) self.assertTrue(issubclass(str, A))
self.assertEqual(issubclass(str, (A,)), True) self.assertTrue(issubclass(str, (A,)))
self.assertEqual(issubclass(C, A), True) self.assertTrue(issubclass(C, A))
self.assertEqual(issubclass(C, (A,)), True) self.assertTrue(issubclass(C, (A,)))
def test_registration_edge_cases(self): def test_registration_edge_cases(self):
class A(metaclass=abc.ABCMeta): class A(metaclass=abc.ABCMeta):