Skip to content

Reverse the meaning of is_argument when used for type check #7039

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
ilevkivskyi merged 1 commit into from
May 23, 2018
Merged

Reverse the meaning of is_argument when used for type check #7039

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions Lib/typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
# legitimate imports of those modules.


def _type_check(arg, msg, is_argument=False):
def _type_check(arg, msg, is_argument=True):
"""Check that the argument is a type, and return it (internal helper).

As a special case, accept None and return type(None) instead. Also wrap strings
Expand All @@ -119,7 +119,7 @@ def _type_check(arg, msg, is_argument=False):
We append the repr() of the actual value (truncated to 100 chars).
"""
invalid_generic_forms = (Generic, _Protocol)
if not is_argument:
if is_argument:
invalid_generic_forms = invalid_generic_forms + (ClassVar, )

if arg is None:
Expand Down Expand Up @@ -445,7 +445,7 @@ class ForwardRef(_Final, _root=True):
'__forward_evaluated__', '__forward_value__',
'__forward_is_argument__')

def __init__(self, arg, is_argument=False):
def __init__(self, arg, is_argument=True):
if not isinstance(arg, str):
raise TypeError(f"Forward reference must be a string -- got {arg!r}")
try:
Expand Down Expand Up @@ -979,7 +979,7 @@ def get_type_hints(obj, globalns=None, localns=None):
if value is None:
value = type(None)
if isinstance(value, str):
value = ForwardRef(value, is_argument=True)
value = ForwardRef(value, is_argument=False)
value = _eval_type(value, base_globals, localns)
hints[name] = value
return hints
Expand Down