Author: Matti Picus <[email protected]>
Branch:
Changeset: r91784:28c29133a557
Date: 2017-07-07 10:50 +0300
http://bitbucket.org/pypy/pypy/changeset/28c29133a557/
Log: merge branch to set __hash__ to None if tp_hash is
PyObject_HashNotImplemented
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -21,3 +21,7 @@
.. branch: issue-2592
CPyext PyListObject.pop must return the value
+
+.. branch: cpyext-hash_notimpl
+
+If ``tp_hash`` is ``PyObject_HashNotImplemented``, set
``obj.__dict__['__hash__']`` to None
diff --git a/pypy/module/cpyext/test/test_typeobject.py
b/pypy/module/cpyext/test/test_typeobject.py
--- a/pypy/module/cpyext/test/test_typeobject.py
+++ b/pypy/module/cpyext/test/test_typeobject.py
@@ -1347,3 +1347,33 @@
Bsize = module.get_basicsize(B)
assert Asize == Bsize
assert Asize > basesize
+
+
+class AppTestHashable(AppTestCpythonExtensionBase):
+ def test_unhashable(self):
+ if not self.runappdirect:
+ skip('pointer to function equality available'
+ ' only after translation')
+ module = self.import_extension('foo', [
+ ("new_obj", "METH_NOARGS",
+ '''
+ PyObject *obj;
+ obj = PyObject_New(PyObject, &Foo_Type);
+ return obj;
+ '''
+ )], prologue='''
+ static PyTypeObject Foo_Type = {
+ PyVarObject_HEAD_INIT(NULL, 0)
+ "foo.foo",
+ };
+ ''', more_init = '''
+ Foo_Type.tp_flags = Py_TPFLAGS_DEFAULT;
+ Foo_Type.tp_hash = PyObject_HashNotImplemented;
+ if (PyType_Ready(&Foo_Type) < 0) INITERROR;
+ ''')
+ obj = module.new_obj()
+ raises(TypeError, hash, obj)
+ assert type(obj).__dict__['__hash__'] is None
+ # this is equivalent to
+ from collections import Hashable
+ assert not isinstance(obj, Hashable)
diff --git a/pypy/module/cpyext/typeobject.py b/pypy/module/cpyext/typeobject.py
--- a/pypy/module/cpyext/typeobject.py
+++ b/pypy/module/cpyext/typeobject.py
@@ -338,13 +338,19 @@
setattr(struct, slot_names[1], slot_func_helper)
def add_operators(space, dict_w, pto):
- # XXX support PyObject_HashNotImplemented
+ from pypy.module.cpyext.object import PyObject_HashNotImplemented
+ hash_not_impl = PyObject_HashNotImplemented.api_func.get_llhelper(space)
for method_name, slot_names, wrapper_func, wrapper_func_kwds, doc in
slotdefs_for_wrappers:
if method_name in dict_w:
continue
offset = [rffi.offsetof(lltype.typeOf(pto).TO, slot_names[0])]
if len(slot_names) == 1:
func = getattr(pto, slot_names[0])
+ if slot_names[0] == 'c_tp_hash':
+ if hash_not_impl == func:
+ # special case for tp_hash == PyObject_HashNotImplemented
+ dict_w[method_name] = space.w_None
+ continue
else:
assert len(slot_names) == 2
struct = getattr(pto, slot_names[0])
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
