Skip to content

make __class__ refer to the current object's class #2480

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
msullivan merged 1 commit into from
Sep 26, 2018
Merged

make __class__ refer to the current object's class #2480

Show file tree
Hide file tree
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
Revert "Revert "make __class__ refer to the current object's class (#… 
…1549)" (#1632)"

This reverts commit 78587dc.
  • Loading branch information
@msullivan
msullivan committed Sep 26, 2018
commit d989dc70fa83df9ff6d0206ff8d7ba6dead8040c
7 changes: 5 additions & 2 deletions stdlib/2/__builtin__.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ from typing import (
SupportsComplex, SupportsRound, IO, BinaryIO, Union, AnyStr, MutableSequence, MutableMapping,
MutableSet, ItemsView, KeysView, ValuesView, Optional, Container, Type
)
from abc import abstractmethod, ABCMeta
from abc import ABCMeta

_T = TypeVar('_T')
_T_co = TypeVar('_T_co', covariant=True)
Expand All @@ -27,11 +27,14 @@ _TT = TypeVar('_TT', bound='type')

class object:
__doc__ = ... # type: Optional[str]
__class__ = ... # type: type
__dict__ = ... # type: Dict[str, Any]
__slots__ = ... # type: Union[str, unicode, Iterable[Union[str, unicode]]]
__module__ = ... # type: str

@property
def __class__(self: _T) -> Type[_T]: ...
@__class__.setter
def __class__(self, __type: Type[object]) -> None: ...
def __init__(self) -> None: ...
def __new__(cls) -> Any: ...
def __setattr__(self, name: str, value: Any) -> None: ...
Expand Down
7 changes: 5 additions & 2 deletions stdlib/2/builtins.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ from typing import (
SupportsComplex, SupportsRound, IO, BinaryIO, Union, AnyStr, MutableSequence, MutableMapping,
MutableSet, ItemsView, KeysView, ValuesView, Optional, Container, Type
)
from abc import abstractmethod, ABCMeta
from abc import ABCMeta

_T = TypeVar('_T')
_T_co = TypeVar('_T_co', covariant=True)
Expand All @@ -27,11 +27,14 @@ _TT = TypeVar('_TT', bound='type')

class object:
__doc__ = ... # type: Optional[str]
__class__ = ... # type: type
__dict__ = ... # type: Dict[str, Any]
__slots__ = ... # type: Union[str, unicode, Iterable[Union[str, unicode]]]
__module__ = ... # type: str

@property
def __class__(self: _T) -> Type[_T]: ...
@__class__.setter
def __class__(self, __type: Type[object]) -> None: ...
def __init__(self) -> None: ...
def __new__(cls) -> Any: ...
def __setattr__(self, name: str, value: Any) -> None: ...
Expand Down
1 change: 0 additions & 1 deletion stdlib/2/types.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ class UnboundMethodType:

class InstanceType:
__doc__ = ... # type: Optional[str]
__class__ = ... # type: type
__module__ = ... # type: Any

MethodType = UnboundMethodType
Expand Down
5 changes: 4 additions & 1 deletion stdlib/3/builtins.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,16 @@ _TT = TypeVar('_TT', bound='type')

class object:
__doc__ = ... # type: Optional[str]
__class__ = ... # type: type
__dict__ = ... # type: Dict[str, Any]
__slots__ = ... # type: Union[str, Iterable[str]]
__module__ = ... # type: str
if sys.version_info >= (3, 6):
__annotations__ = ... # type: Dict[str, Any]

@property
def __class__(self: _T) -> Type[_T]: ...
@__class__.setter
def __class__(self, __type: Type[object]) -> None: ...
def __init__(self) -> None: ...
def __new__(cls) -> Any: ...
def __setattr__(self, name: str, value: Any) -> None: ...
Expand Down