From f8ad09b8e16652ca16cceecdef77d23023c936c6 Mon Sep 17 00:00:00 2001 From: Jacob Beck Date: Fri, 13 May 2016 19:01:22 -0600 Subject: [PATCH 1/2] Make property a type --- stdlib/2.7/__builtin__.pyi | 10 +++++++++- stdlib/3/builtins.pyi | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/stdlib/2.7/__builtin__.pyi b/stdlib/2.7/__builtin__.pyi index a93555dddc61..ee172177aabd 100644 --- a/stdlib/2.7/__builtin__.pyi +++ b/stdlib/2.7/__builtin__.pyi @@ -24,7 +24,6 @@ _T4 = TypeVar('_T4') staticmethod = object() # Special, only valid as a decorator. classmethod = object() # Special, only valid as a decorator. -property = object() class object: __doc__ = ... # type: str @@ -639,6 +638,15 @@ class module: __file__ = ... # type: str __dict__ = ... # type: Dict[unicode, Any] +class property: + def __init__(self, fget: Callable[[_S], _T1] = None, fset: Callable[[_S, _T2], None] = None, fdel: Callable[[_S], None] = None, doc: str = None) -> None: ... + def getter(self, fget: Callable[[_S], _T1]) -> property: ... + def setter(self, fset: Callable[[_S, _T2], None]) -> property: ... + def deleter(self, fdel: Callable[[_S], None]) -> property: ... + def __get__(self, obj: _S, type: type=None) -> _T1: ... + def __set__(self, obj: _S, value: _T2) -> None: ... + def __del__(self, obj: _S) -> None: ... + long = int bytes = str diff --git a/stdlib/3/builtins.pyi b/stdlib/3/builtins.pyi index f7e8562e152d..3e30969761fa 100644 --- a/stdlib/3/builtins.pyi +++ b/stdlib/3/builtins.pyi @@ -23,7 +23,6 @@ _T4 = TypeVar('_T4') staticmethod = object() # Only valid as a decorator. classmethod = object() # Only valid as a decorator. -property = object() class object: __doc__ = ... # type: str @@ -616,6 +615,15 @@ class module: __file__ = ... # type: str __dict__ = ... # type: Dict[str, Any] +class property: + def __init__(self, fget: Callable[[_S], _T1] = None, fset: Callable[[_S, _T2], None] = None, fdel: Callable[[_S], None] = None, doc: str = None) -> None: ... + def getter(self, fget: Callable[[_S], _T1]) -> property: ... + def setter(self, fset: Callable[[_S, _T2], None]) -> property: ... + def deleter(self, fdel: Callable[[_S], None]) -> property: ... + def __get__(self, obj: _S, type: type=None) -> _T1: ... + def __set__(self, obj: _S, value: _T2) -> None: ... + def __del__(self, obj: _S) -> None: ... + NotImplemented = ... # type: Any def abs(n: SupportsAbs[_T]) -> _T: ... From 21c0228a9185525081ef8b9028c37e243a2fc916 Mon Sep 17 00:00:00 2001 From: Jacob Beck Date: Sat, 14 May 2016 00:00:27 -0600 Subject: [PATCH 2/2] Formatting, type cleanup --- stdlib/2.7/__builtin__.pyi | 16 +++++++++------- stdlib/3/builtins.pyi | 16 +++++++++------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/stdlib/2.7/__builtin__.pyi b/stdlib/2.7/__builtin__.pyi index ee172177aabd..b9ba65f6ce75 100644 --- a/stdlib/2.7/__builtin__.pyi +++ b/stdlib/2.7/__builtin__.pyi @@ -639,13 +639,15 @@ class module: __dict__ = ... # type: Dict[unicode, Any] class property: - def __init__(self, fget: Callable[[_S], _T1] = None, fset: Callable[[_S, _T2], None] = None, fdel: Callable[[_S], None] = None, doc: str = None) -> None: ... - def getter(self, fget: Callable[[_S], _T1]) -> property: ... - def setter(self, fset: Callable[[_S, _T2], None]) -> property: ... - def deleter(self, fdel: Callable[[_S], None]) -> property: ... - def __get__(self, obj: _S, type: type=None) -> _T1: ... - def __set__(self, obj: _S, value: _T2) -> None: ... - def __del__(self, obj: _S) -> None: ... + def __init__(self, fget: Callable[[Any], Any] = None, + fset: Callable[[Any, Any], None] = None, + fdel: Callable[[Any], None] = None, doc: str = None) -> None: ... + def getter(self, fget: Callable[[Any], Any]) -> property: ... + def setter(self, fset: Callable[[Any, Any], None]) -> property: ... + def deleter(self, fdel: Callable[[Any], None]) -> property: ... + def __get__(self, obj: Any, type: type=None) -> Any: ... + def __set__(self, obj: Any, value: Any) -> None: ... + def __del__(self, obj: Any) -> None: ... long = int bytes = str diff --git a/stdlib/3/builtins.pyi b/stdlib/3/builtins.pyi index 3e30969761fa..b0217bb936e5 100644 --- a/stdlib/3/builtins.pyi +++ b/stdlib/3/builtins.pyi @@ -616,13 +616,15 @@ class module: __dict__ = ... # type: Dict[str, Any] class property: - def __init__(self, fget: Callable[[_S], _T1] = None, fset: Callable[[_S, _T2], None] = None, fdel: Callable[[_S], None] = None, doc: str = None) -> None: ... - def getter(self, fget: Callable[[_S], _T1]) -> property: ... - def setter(self, fset: Callable[[_S, _T2], None]) -> property: ... - def deleter(self, fdel: Callable[[_S], None]) -> property: ... - def __get__(self, obj: _S, type: type=None) -> _T1: ... - def __set__(self, obj: _S, value: _T2) -> None: ... - def __del__(self, obj: _S) -> None: ... + def __init__(self, fget: Callable[[Any], Any] = None, + fset: Callable[[Any, Any], None] = None, + fdel: Callable[[Any], None] = None, doc: str = None) -> None: ... + def getter(self, fget: Callable[[Any], Any]) -> property: ... + def setter(self, fset: Callable[[Any, Any], None]) -> property: ... + def deleter(self, fdel: Callable[[Any], None]) -> property: ... + def __get__(self, obj: Any, type: type=None) -> Any: ... + def __set__(self, obj: Any, value: Any) -> None: ... + def __del__(self, obj: Any) -> None: ... NotImplemented = ... # type: Any