Kaydet (Commit) 0e61dffd authored tarafından Nina Zakharenko's avatar Nina Zakharenko Kaydeden (comit) Ivan Levkivskyi

Reverse the meaning of is_argument when used for type check (GH-7039)

üst 8bb0b5b0
...@@ -106,7 +106,7 @@ __all__ = [ ...@@ -106,7 +106,7 @@ __all__ = [
# legitimate imports of those modules. # 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). """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 As a special case, accept None and return type(None) instead. Also wrap strings
...@@ -119,7 +119,7 @@ def _type_check(arg, msg, is_argument=False): ...@@ -119,7 +119,7 @@ def _type_check(arg, msg, is_argument=False):
We append the repr() of the actual value (truncated to 100 chars). We append the repr() of the actual value (truncated to 100 chars).
""" """
invalid_generic_forms = (Generic, _Protocol) invalid_generic_forms = (Generic, _Protocol)
if not is_argument: if is_argument:
invalid_generic_forms = invalid_generic_forms + (ClassVar, ) invalid_generic_forms = invalid_generic_forms + (ClassVar, )
if arg is None: if arg is None:
...@@ -445,7 +445,7 @@ class ForwardRef(_Final, _root=True): ...@@ -445,7 +445,7 @@ class ForwardRef(_Final, _root=True):
'__forward_evaluated__', '__forward_value__', '__forward_evaluated__', '__forward_value__',
'__forward_is_argument__') '__forward_is_argument__')
def __init__(self, arg, is_argument=False): def __init__(self, arg, is_argument=True):
if not isinstance(arg, str): if not isinstance(arg, str):
raise TypeError(f"Forward reference must be a string -- got {arg!r}") raise TypeError(f"Forward reference must be a string -- got {arg!r}")
try: try:
...@@ -979,7 +979,7 @@ def get_type_hints(obj, globalns=None, localns=None): ...@@ -979,7 +979,7 @@ def get_type_hints(obj, globalns=None, localns=None):
if value is None: if value is None:
value = type(None) value = type(None)
if isinstance(value, str): if isinstance(value, str):
value = ForwardRef(value, is_argument=True) value = ForwardRef(value, is_argument=False)
value = _eval_type(value, base_globals, localns) value = _eval_type(value, base_globals, localns)
hints[name] = value hints[name] = value
return hints return hints
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment