builtins use definition from numbers

Author: tharvik

stdlib/2.7/__builtin__.pyi

@@ -11,6 +11,7 @@ from typing import (
     MutableSet, ItemsView, KeysView, ValuesView
 )
 from abc import abstractmethod, ABCMeta
+import numbers
 
 _T = TypeVar('_T')
 _T_co = TypeVar('_T_co', covariant=True)
@@ -62,7 +63,7 @@ class type:
     def mro(self) -> List[type]: ...
     def __subclasses__(self) -> List[type]: ...
 
-class int(SupportsInt, SupportsFloat, SupportsAbs[int]):
+class int(numbers.Integral):
     @overload
     def __init__(self) -> None: ...
     @overload
@@ -114,7 +115,7 @@ class int(SupportsInt, SupportsFloat, SupportsAbs[int]):
     def __abs__(self) -> int: ...
     def __hash__(self) -> int: ...
 
-class float(SupportsFloat, SupportsInt, SupportsAbs[float]):
+class float(numbers.Real):
     @overload
     def __init__(self) -> None: ...
     @overload
@@ -161,7 +162,7 @@ class float(SupportsFloat, SupportsInt, SupportsAbs[float]):
     def __abs__(self) -> float: ...
     def __hash__(self) -> int: ...
 
-class complex(SupportsAbs[float]):
+class complex(numbers.complex):
     @overload
     def __init__(self, re: float = 0.0, im: float = 0.0) -> None: ...
     @overload

stdlib/2.7/typing.pyi

@@ -1,6 +1,7 @@
 # Stubs for typing (Python 2.7)
 
 from abc import abstractmethod, ABCMeta
+import numbers
 
 # Definitions of special type checking related constructs.  Their definition
 # are not used, so their value does not matter.
@@ -50,7 +51,7 @@ _T_contra = TypeVar('_T_contra', contravariant=True)  # Ditto contravariant.
 
 class SupportsComplex(metaclass=ABCMeta):
     @abstractmethod
-    def __complex__(self) -> complex: pass
+    def __complex__(self) -> numbers.Complex: pass
 
 class SupportsInt(metaclass=ABCMeta):
     @abstractmethod

stdlib/2and3/numbers.pyi

@@ -10,7 +10,7 @@ import sys
 
 class Number: ...
 
-class Complex(Number, SupportsComplex, SupportsAbs):
+class Complex(Number, SupportsComplex, SupportsAbs[float]):
     @property
     @abstractmethod
     def real(self) -> Complex: ...
@@ -68,7 +68,7 @@ class Rational(Real):
     def denominator(self) -> int: ...
     def __float__(self) -> float: ...
 
-class Integral(Rational, SupportsInt):
+class Integral(Rational, SupportsInt, SupportsAbs[int]):
     @property
     def numerator(self) -> int: ...
     @property

stdlib/3/builtins.pyi

@@ -8,6 +8,7 @@ from typing import (
 )
 from abc import abstractmethod, ABCMeta
 from types import TracebackType
+import numbers
 import sys
 
 # Note that names imported above are not automatically made visible via the
@@ -62,7 +63,7 @@ class type:
     # implementation seems to be returning a list.
     def mro(self) -> List[type]: ...
 
-class int(SupportsInt, SupportsFloat, SupportsAbs[int]):
+class int(numbers.Integral):
     def __init__(self, x: Union[SupportsInt, str, bytes] = None, base: int = None) -> None: ...
     def bit_length(self) -> int: ...
     def to_bytes(self, length: int, byteorder: str, *, signed: bool = ...) -> bytes: ...
@@ -111,7 +112,7 @@ class int(SupportsInt, SupportsFloat, SupportsAbs[int]):
     def __abs__(self) -> int: ...
     def __hash__(self) -> int: ...
 
-class float(SupportsFloat, SupportsInt, SupportsAbs[float]):
+class float(numbers.Real):
     def __init__(self, x: Union[SupportsFloat, str, bytes]=None) -> None: ...
     def as_integer_ratio(self) -> Tuple[int, int]: ...
     def hex(self) -> str: ...
@@ -149,7 +150,7 @@ class float(SupportsFloat, SupportsInt, SupportsAbs[float]):
     def __abs__(self) -> float: ...
     def __hash__(self) -> int: ...
 
-class complex(SupportsAbs[float]):
+class complex(numbers.Complex):
     @overload
     def __init__(self, re: float = 0.0, im: float = 0.0) -> None: ...
     @overload

stdlib/3/typing.pyi

@@ -1,6 +1,7 @@
 # Stubs for typing
 
 from abc import abstractmethod, ABCMeta
+import numbers
 
 # Definitions of special type checking related constructs.  Their definition
 # are not used, so their value does not matter.
@@ -59,7 +60,7 @@ class SupportsFloat(metaclass=ABCMeta):
 
 class SupportsComplex(metaclass=ABCMeta):
     @abstractmethod
-    def __complex__(self) -> complex: pass
+    def __complex__(self) -> numbers.Complex: pass
 
 class SupportsBytes(metaclass=ABCMeta):
     @abstractmethod