[pypy-commit] pypy closed-branches: Merge closed head f66fb3f73241 on branch py3.5-str-opt

[mattip]

Author: Matti Picus 
Branch: closed-branches
Changeset: r91689:c7748d7b19fc
Date: 2017-07-05 09:21 -0400
http://bitbucket.org/pypy/pypy/changeset/c7748d7b19fc/

Log:Merge closed head f66fb3f73241 on branch py3.5-str-opt

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 4e71c0d2e82d on branch redirect-assembler-jitlog

[mattip]

Author: Matti Picus 
Branch: closed-branches
Changeset: r91688:de711d554745
Date: 2017-07-05 09:21 -0400
http://bitbucket.org/pypy/pypy/changeset/de711d554745/

Log:Merge closed head 4e71c0d2e82d on branch redirect-assembler-jitlog

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head e2f4c23003f3 on branch ppc-vsx-support

[mattip]

Author: Matti Picus 
Branch: closed-branches
Changeset: r91691:0f33300db759
Date: 2017-07-05 09:21 -0400
http://bitbucket.org/pypy/pypy/changeset/0f33300db759/

Log:Merge closed head e2f4c23003f3 on branch ppc-vsx-support

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 9218bb33a6ad on branch py3.5-set-sentinel

[mattip]

Author: Matti Picus 
Branch: closed-branches
Changeset: r91693:1b8f079d387b
Date: 2017-07-05 09:21 -0400
http://bitbucket.org/pypy/pypy/changeset/1b8f079d387b/

Log:Merge closed head 9218bb33a6ad on branch py3.5-set-sentinel

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 96b8b69e7672 on branch py3.5-byteformat

[mattip]

Author: Matti Picus 
Branch: closed-branches
Changeset: r91695:c0f005355095
Date: 2017-07-05 09:21 -0400
http://bitbucket.org/pypy/pypy/changeset/c0f005355095/

Log:Merge closed head 96b8b69e7672 on branch py3.5-byteformat

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head cacb8b75f437 on branch py3.5-memoryview

[mattip]

Author: Matti Picus 
Branch: closed-branches
Changeset: r91696:e560f4726c36
Date: 2017-07-05 09:21 -0400
http://bitbucket.org/pypy/pypy/changeset/e560f4726c36/

Log:Merge closed head cacb8b75f437 on branch py3.5-memoryview

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 270b5ea6f31a on branch cppyy-skip

[mattip]

Author: Matti Picus 
Branch: closed-branches
Changeset: r91698:bf1b9aedca5d
Date: 2017-07-05 09:21 -0400
http://bitbucket.org/pypy/pypy/changeset/bf1b9aedca5d/

Log:Merge closed head 270b5ea6f31a on branch cppyy-skip

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 72905ffbd8b5 on branch py3.5-multiprocessing

[mattip]

Author: Matti Picus 
Branch: closed-branches
Changeset: r91702:ec2985c3234b
Date: 2017-07-05 09:21 -0400
http://bitbucket.org/pypy/pypy/changeset/ec2985c3234b/

Log:Merge closed head 72905ffbd8b5 on branch py3.5-multiprocessing

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: re-close this branch

[mattip]

Author: Matti Picus 
Branch: closed-branches
Changeset: r91707:d396b7caa115
Date: 2017-07-05 09:21 -0400
http://bitbucket.org/pypy/pypy/changeset/d396b7caa115/

Log:re-close this branch

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 6b1791c1eb9e on branch optinfo-into-bridges-2

[mattip]

Author: Matti Picus 
Branch: closed-branches
Changeset: r91703:8adc6cbfa7af
Date: 2017-07-05 09:21 -0400
http://bitbucket.org/pypy/pypy/changeset/8adc6cbfa7af/

Log:Merge closed head 6b1791c1eb9e on branch optinfo-into-bridges-2

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 136caa31d4f8 on branch py3.5-text-utf8

[mattip]

Author: Matti Picus 
Branch: closed-branches
Changeset: r91705:d5bdcfcf0be3
Date: 2017-07-05 09:21 -0400
http://bitbucket.org/pypy/pypy/changeset/d5bdcfcf0be3/

Log:Merge closed head 136caa31d4f8 on branch py3.5-text-utf8

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 3b422e4d09f4 on branch strbuf-as-buffer

[mattip]

Author: Matti Picus 
Branch: closed-branches
Changeset: r91699:f816d477104b
Date: 2017-07-05 09:21 -0400
http://bitbucket.org/pypy/pypy/changeset/f816d477104b/

Log:Merge closed head 3b422e4d09f4 on branch strbuf-as-buffer

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 76ca536c7972 on branch get/setpriority

[mattip]

Author: Matti Picus 
Branch: closed-branches
Changeset: r91704:47ca24422a8e
Date: 2017-07-05 09:21 -0400
http://bitbucket.org/pypy/pypy/changeset/47ca24422a8e/

Log:Merge closed head 76ca536c7972 on branch get/setpriority

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 3071469e3277 on branch cpyext-unhashable

[mattip]

Author: Matti Picus 
Branch: closed-branches
Changeset: r91706:b95303966ebf
Date: 2017-07-05 09:21 -0400
http://bitbucket.org/pypy/pypy/changeset/b95303966ebf/

Log:Merge closed head 3071469e3277 on branch cpyext-unhashable

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy cpyext-hash_notimpl: failing test, start to implement check for PyObject_HashNotImplemented (last Numpy test failure)

[mattip]

Author: Matti Picus 
Branch: cpyext-hash_notimpl
Changeset: r91708:d3c446f2be53
Date: 2017-07-05 09:30 -0400
http://bitbucket.org/pypy/pypy/changeset/d3c446f2be53/

Log:failing test, start to implement check for
PyObject_HashNotImplemented (last Numpy test failure)

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,30 @@
 Bsize = module.get_basicsize(B)
 assert Asize == Bsize
 assert Asize > basesize
+
+
+class AppTestHashable(AppTestCpythonExtensionBase):
+def test_unhashable(self):
+module = self.import_extension('foo', [
+   ("new_obj", "METH_NOARGS",
+'''
+PyObject *obj;
+obj = PyObject_New(PyObject, _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(_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,22 @@
 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':
+# XXX if it is hash_not_impl, do not assign to dict_w
+# name = rffi.charp2str(pto.c_tp_name)
+# if 'foo' in name:
+#import pdb;pdb.set_trace()
+if hash_not_impl == func:
+# XXX never reached
+continue
 else:
 assert len(slot_names) == 2
 struct = getattr(pto, slot_names[0])
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head fd3ba0d1944d on branch py3.5-time

[mattip]

Author: Matti Picus 
Branch: closed-branches
Changeset: r91701:8172dc82e3c2
Date: 2017-07-05 09:21 -0400
http://bitbucket.org/pypy/pypy/changeset/8172dc82e3c2/

Log:Merge closed head fd3ba0d1944d on branch py3.5-time

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 7722123bf2e8 on branch py3.5-async

[mattip]

Author: Matti Picus 
Branch: closed-branches
Changeset: r91697:0d4ea2491a86
Date: 2017-07-05 09:21 -0400
http://bitbucket.org/pypy/pypy/changeset/0d4ea2491a86/

Log:Merge closed head 7722123bf2e8 on branch py3.5-async

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 19ec2131220b on branch py3.5-raffael_t

[mattip]

Author: Matti Picus 
Branch: closed-branches
Changeset: r91692:9e587b8a9bd7
Date: 2017-07-05 09:21 -0400
http://bitbucket.org/pypy/pypy/changeset/9e587b8a9bd7/

Log:Merge closed head 19ec2131220b on branch py3.5-raffael_t

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 8e6bf680169d on branch cpyext-from

[mattip]

Author: Matti Picus 
Branch: closed-branches
Changeset: r91700:5cc1effc9c5f
Date: 2017-07-05 09:21 -0400
http://bitbucket.org/pypy/pypy/changeset/5cc1effc9c5f/

Log:Merge closed head 8e6bf680169d on branch cpyext-from

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 7fed195ea34f on branch py3.5-bz2-lzma

[mattip]

Author: Matti Picus 
Branch: closed-branches
Changeset: r91694:1d5e10a93476
Date: 2017-07-05 09:21 -0400
http://bitbucket.org/pypy/pypy/changeset/1d5e10a93476/

Log:Merge closed head 7fed195ea34f on branch py3.5-bz2-lzma

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 7a26879def9e on branch s390x-old-cpu-no-jit

[mattip]

Author: Matti Picus 
Branch: closed-branches
Changeset: r91690:db312d59b90d
Date: 2017-07-05 09:21 -0400
http://bitbucket.org/pypy/pypy/changeset/db312d59b90d/

Log:Merge closed head 7a26879def9e on branch s390x-old-cpu-no-jit

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy closed-branches: Merge closed head 12f2f971dd86 on branch stdlib-2.7.11

[mattip]

Author: Matti Picus 
Branch: closed-branches
Changeset: r91687:8fa25f8bd8d5
Date: 2017-07-05 09:21 -0400
http://bitbucket.org/pypy/pypy/changeset/8fa25f8bd8d5/

Log:Merge closed head 12f2f971dd86 on branch stdlib-2.7.11

___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

[pypy-commit] pypy.org extradoc: update the values

[arigo]

Author: Armin Rigo 
Branch: extradoc
Changeset: r896:180845213c1c
Date: 2017-07-05 22:45 +0200
http://bitbucket.org/pypy/pypy.org/changeset/180845213c1c/

Log:update the values

diff --git a/don1.html b/don1.html
--- a/don1.html
+++ b/don1.html
@@ -15,7 +15,7 @@
 
 

-   $67112 of $105000 (63.9%)
+   $67126 of $105000 (63.9%)


 
@@ -23,7 +23,7 @@
   
   This donation goes towards supporting Python 3 in 
PyPy.
   Current status:
-we have $2887 left
+we have $2900 left
   in the account. Read proposal
   
   
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit