Skip to content

bpo-41905: added abc.update_abstractmethods #22485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gvanrossum merged 21 commits into from
Oct 6, 2020
Merged

bpo-41905: added abc.update_abstractmethods #22485

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
f65b0f8
added update_abstractmethods
Oct 1, 2020
c04ba74
📜🤖 Added by blurb_it.
blurb-it[bot] Oct 1, 2020
ea69ae6
fix whitespaces
Oct 1, 2020
8b76715
Merge branch 'master' of https://github.com/bentheiii/cpython into ma…
Oct 1, 2020
61c4f40
documentation fixes
Oct 1, 2020
a5a9fd7
additional tests
Oct 1, 2020
5e1fffc
rename test
Oct 1, 2020
2f95b84
added explicit check for ABCMeta
Oct 1, 2020
3986c98
optimization on total_ordering
Oct 2, 2020
4f3d846
update_abstractmethods now ignores non-abstract classes
Oct 3, 2020
74473c8
total_ordering now only overrides abtract methods defined in supercla…
Oct 3, 2020
92326c9
doc fix
Oct 3, 2020
1e47ee4
excluded total_ordering from this issue
Oct 3, 2020
740183f
documented ABC being ABC unaware
Oct 3, 2020
114028e
fixed potential bug with deletion of implementation
Oct 4, 2020
ba8df08
added layered test case
Oct 4, 2020
29dba37
update_abstractmethods doesn't care about subclasses for now
Oct 4, 2020
779e6cf
doc fixes
Oct 4, 2020
eea97f4
Update Doc/library/abc.rst
bentheiii Oct 5, 2020
8eec6c2
Update Lib/abc.py
bentheiii Oct 5, 2020
5698153
Update Lib/abc.py
bentheiii Oct 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
additional tests
  • Loading branch information
ben avrahami
ben avrahami committed Oct 1, 2020
commit a5a9fd7e941bfe53a4178f75e6e312f287ba0771
34 changes: 34 additions & 0 deletions Lib/test/test_abc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,22 @@ class C(with_metaclass(abc_ABCMeta, A, B)):
pass
self.assertEqual(C.__class__, abc_ABCMeta)

def test_update_del(self):
class A(metaclass=abc_ABCMeta):
@abc.abstractmethod
def foo(self):
pass

del A.foo
self.assertEqual(A.__abstractmethods__, {'foo'})
self.assertFalse(hasattr(A, 'foo'))

abc.update_abstractmethods(A)

self.assertEqual(A.__abstractmethods__, set())
A()


def test_update_new_abstractmethods(self):
class A(metaclass=abc_ABCMeta):
@abc.abstractmethod
Expand Down Expand Up @@ -524,6 +540,24 @@ class B(A):
B()
self.assertEqual(B.__abstractmethods__, set())

@iritkatriel iritkatriel Oct 1, 2020 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you need this test case to cover the first loop:

import abc
class FooABC(metaclass=abc.ABCMeta):
    @abc.abstractmethod
    def bar(self):
        pass

del FooABC.bar
assert ('bar' in FooABC.__abstractmethods__)
assert ('bar' not in FooABC.__dict__)

@gvanrossum gvanrossum Oct 4, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@iritkatriel What does that test case accomplish other than showing that FooABC is now in an inconsistent state?

@iritkatriel iritkatriel Oct 4, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gvanrossum In this comment I left out the update_abstractmethods, see Ben's version which he committed as test_update_del. Without this test the first loop in update_abstractmethods was not exercised.

def test_update_asdecorator(self):
class A(metaclass=abc_ABCMeta):
@abc.abstractmethod
def foo(self):
pass

def class_decorator(cls):
cls.foo = lambda self: None
return cls

@abc.update_abstractmethods
@class_decorator
class B(A):
pass

B()
self.assertEqual(B.__abstractmethods__, set())


class TestABCWithInitSubclass(unittest.TestCase):
def test_works_with_init_subclass(self):
Expand Down