Skip to content

[3.6] bpo-27984: Limit the cls argument of singledispatch.register and #6115

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

Closed
zhangyangyu wants to merge 2 commits into from
Closed

[3.6] bpo-27984: Limit the cls argument of singledispatch.register and #6115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64437a3
bpo-27984: Limit the cls argument of singledispatch.register and
zhangyangyu Mar 14, 2018
1bea6bb
add NEWs
zhangyangyu Mar 14, 2018
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
6 changes: 6 additions & 0 deletions Lib/functools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,6 +769,9 @@ def dispatch(cls):

"""
nonlocal cache_token
if not isinstance(cls, type):
raise TypeError("dispatch() argument must be a type: {!r}"
.format(cls))
if cache_token is not None:
current_token = get_cache_token()
if cache_token != current_token:
Expand All @@ -791,6 +794,9 @@ def register(cls, func=None):

"""
nonlocal cache_token
if not isinstance(cls, type):
raise TypeError("register() argument must be a type: {!r}"
.format(cls))
if func is None:
return lambda f: register(cls, f)
registry[cls] = func
Expand Down
12 changes: 12 additions & 0 deletions Lib/test/test_functools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2078,6 +2078,18 @@ class X:
self.assertEqual(len(td), 0)
functools.WeakKeyDictionary = _orig_wkd

def test_invalid_arguments(self):
# issue27984
from enum import Enum
IS = Enum("IS", "a, b")
@functools.singledispatch
def g(obj):
return "base"
with self.assertRaisesRegex(TypeError, "argument must be a type"):
g.register(IS.a)
with self.assertRaisesRegex(TypeError, "argument must be a type"):
g.dispatch(IS.b)


if __name__ == '__main__':
unittest.main()
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2018-03-14-21-14-01.bpo-27984.9uyg-9.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Non-type cls argument to singledispatch.register and singledispatch.dispatch
will raise a TypeError.