Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
0dac68f1
Commit
0dac68f1
authored
Aug 29, 2019
by
Raymond Hettinger
Committed by
GitHub
Aug 29, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bpo-36743: __get__ is sometimes called without the owner argument (#12992)
parent
84125fed
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
13 deletions
+24
-13
Doc/reference/datamodel.rst
Doc/reference/datamodel.rst
+18
-7
Lib/_pyio.py
Lib/_pyio.py
+1
-1
Lib/functools.py
Lib/functools.py
+3
-3
Lib/unittest/mock.py
Lib/unittest/mock.py
+1
-1
Tools/demo/eiffel.py
Tools/demo/eiffel.py
+1
-1
No files found.
Doc/reference/datamodel.rst
View file @
0dac68f1
...
...
@@ -1618,21 +1618,32 @@ refers to the attribute whose name is the key of the property in the owner
class' :attr:`~object.__dict__`.
.. method:: object.__get__(self, instance, owner)
.. method:: object.__get__(self, instance, owner
=None
)
Called to get the attribute of the owner class (class attribute access) or of an
instance of that class (instance attribute access). *owner* is always the owner
class, while *instance* is the instance that the attribute was accessed through,
or ``None`` when the attribute is accessed through the *owner*. This method
should return the (computed) attribute value or raise an :exc:`AttributeError`
exception.
Called to get the attribute of the owner class (class attribute access) or
of an instance of that class (instance attribute access). The optional
*owner* argument is the owner class, while *instance* is the instance that
the attribute was accessed through, or ``None`` when the attribute is
accessed through the *owner*.
This method should return the computed attribute value or raise an
:exc:`AttributeError` exception.
:PEP:`252` specifies that :meth:`__get__` is callable with one or two
arguments. Python's own built-in descriptors support this specification;
however, it is likely that some third-party tools have descriptors
that require both arguments. Python's own :meth:`__getattribute__`
implementation always passes in both arguments whether they are required
or not.
.. method:: object.__set__(self, instance, value)
Called to set the attribute on an instance *instance* of the owner class to a
new value, *value*.
Note, adding :meth:`__set__` or :meth:`__delete__` changes the kind of
descriptor to a "data descriptor". See :ref:`descriptor-invocation` for
more details.
.. method:: object.__delete__(self, instance)
...
...
Lib/_pyio.py
View file @
0dac68f1
...
...
@@ -283,7 +283,7 @@ except AttributeError:
class
DocDescriptor
:
"""Helper for builtins.open.__doc__
"""
def
__get__
(
self
,
obj
,
typ
):
def
__get__
(
self
,
obj
,
typ
=
None
):
return
(
"open(file, mode='r', buffering=-1, encoding=None, "
"errors=None, newline=None, closefd=True)
\
n
\
n
"
+
...
...
Lib/functools.py
View file @
0dac68f1
...
...
@@ -383,7 +383,7 @@ class partialmethod(object):
_method
.
_partialmethod
=
self
return
_method
def
__get__
(
self
,
obj
,
cls
):
def
__get__
(
self
,
obj
,
cls
=
None
):
get
=
getattr
(
self
.
func
,
"__get__"
,
None
)
result
=
None
if
get
is
not
None
:
...
...
@@ -888,7 +888,7 @@ class singledispatchmethod:
"""
return
self
.
dispatcher
.
register
(
cls
,
func
=
method
)
def
__get__
(
self
,
obj
,
cls
):
def
__get__
(
self
,
obj
,
cls
=
None
):
def
_method
(
*
args
,
**
kwargs
):
method
=
self
.
dispatcher
.
dispatch
(
args
[
0
].
__class__
)
return
method
.
__get__
(
obj
,
cls
)(
*
args
,
**
kwargs
)
...
...
@@ -926,7 +926,7 @@ class cached_property:
f"(
{
self
.
attrname
!
r
}
and
{
name
!
r
}
)."
)
def
__get__
(
self
,
instance
,
owner
):
def
__get__
(
self
,
instance
,
owner
=
None
):
if
instance
is
None
:
return
self
if
self
.
attrname
is
None
:
...
...
Lib/unittest/mock.py
View file @
0dac68f1
...
...
@@ -2804,7 +2804,7 @@ class PropertyMock(Mock):
def
_get_child_mock
(
self
,
/
,
**
kwargs
):
return
MagicMock
(
**
kwargs
)
def
__get__
(
self
,
obj
,
obj_type
):
def
__get__
(
self
,
obj
,
obj_type
=
None
):
return
self
()
def
__set__
(
self
,
obj
,
val
):
self
(
val
)
...
...
Tools/demo/eiffel.py
View file @
0dac68f1
...
...
@@ -78,7 +78,7 @@ class EiffelDescriptor:
self
.
__name__
=
func
.
__name__
self
.
__doc__
=
func
.
__doc__
def
__get__
(
self
,
obj
,
cls
):
def
__get__
(
self
,
obj
,
cls
=
None
):
return
EiffelMethodWrapper
(
obj
,
self
)
def
callmethod
(
self
,
inst
,
args
,
kwargs
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment