Merge branch 'master' into refactor-typing-generic-alias

python · serhiy-storchaka · May 7, 2020 · Apr 26, 2020 · Apr 26, 2020 · May 2, 2020
commit f18888a4ce8d887be14d1fdb1ba60e4173505075
diff --git a/Lib/typing.py b/Lib/typing.py
@@ -728,6 +728,13 @@ def copy_with(self, params):
        return self.__class__(self.__origin__, params, name=self._name, inst=self._inst)

    def __repr__(self):
+        if (self.__origin__ == Union and len(self.__args__) == 2
+                and type(None) in self.__args__):
+            if self.__args__[0] is not type(None):
+                arg = self.__args__[0]
+            else:
+                arg = self.__args__[1]
+            return (f'typing.Optional[{_type_repr(arg)}]')
        if self._name:
            name = 'typing.' + self._name
        else:
@@ -1421,7 +1428,7 @@ def get_args(tp):
    """
    if isinstance(tp, _AnnotatedAlias):
        return (tp.__origin__,) + tp.__metadata__
-    if isinstance(tp, (_BaseGenericAlias, GenericAlias)):
+    if isinstance(tp, (_GenericAlias, GenericAlias)):
        res = tp.__args__
        if tp.__origin__ is collections.abc.Callable and res[0] is not Ellipsis:
            res = (list(res[:-1]), res[-1])