Skip to content
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.

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

bpo-40523: Add pass-throughs for hash() and reversed() to weakref.proxy objects #19946

Merged
merged 1 commit into from
May 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 20 additions & 0 deletions Lib/test/test_weakref.py
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,26 @@ def __iter__(self):
# can be killed in the middle of the call
"blech" in p

def test_proxy_reversed(self):
class MyObj:
def __len__(self):
return 3
def __reversed__(self):
return iter('cba')

obj = MyObj()
self.assertEqual("".join(reversed(weakref.proxy(obj))), "cba")

def test_proxy_hash(self):
cool_hash = 299_792_458
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The fastest hash you will ever see 😉


class MyObj:
def __hash__(self):
return cool_hash

obj = MyObj()
self.assertEqual(hash(weakref.proxy(obj)), cool_hash)

def test_getweakrefcount(self):
o = C()
ref1 = weakref.ref(o)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Add pass-throughs for :func:`hash` and :func:`reversed` to
:class:`weakref.proxy` objects. Patch by Pablo Galindo.
19 changes: 18 additions & 1 deletion Objects/weakrefobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -665,10 +665,12 @@ proxy_iternext(PyWeakReference *proxy)


WRAP_METHOD(proxy_bytes, __bytes__)
WRAP_METHOD(proxy_reversed, __reversed__)


static PyMethodDef proxy_methods[] = {
{"__bytes__", proxy_bytes, METH_NOARGS},
{"__reversed__", proxy_reversed, METH_NOARGS},
{NULL, NULL}
};

Expand Down Expand Up @@ -730,6 +732,21 @@ static PyMappingMethods proxy_as_mapping = {
};


static Py_hash_t
proxy_hash(PyObject *self)
{
PyWeakReference *proxy = (PyWeakReference *)self;
if (!proxy_checkref(proxy)) {
return -1;
}
PyObject *obj = PyWeakref_GET_OBJECT(proxy);
Py_INCREF(obj);
Py_hash_t res = PyObject_Hash(obj);
Py_DECREF(obj);
return res;
}


PyTypeObject
_PyWeakref_ProxyType = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
Expand All @@ -746,7 +763,7 @@ _PyWeakref_ProxyType = {
&proxy_as_number, /* tp_as_number */
&proxy_as_sequence, /* tp_as_sequence */
&proxy_as_mapping, /* tp_as_mapping */
0, /* tp_hash */
proxy_hash, /* tp_hash */
0, /* tp_call */
proxy_str, /* tp_str */
proxy_getattr, /* tp_getattro */
Expand Down