Author: fijal
Branch: memory-accounting
Changeset: r92489:238b67adb061
Date: 2017-09-28 17:54 +0200
http://bitbucket.org/pypy/pypy/changeset/238b67adb061/
Log:write the number of raw malloced bytes into structs that are used
for add_memory_pressure
diff --git a/rpython/annotator/bookk
Author: fijal
Branch: memory-accounting
Changeset: r92490:8e15f0778f6e
Date: 2017-09-28 18:57 +0200
http://bitbucket.org/pypy/pypy/changeset/8e15f0778f6e/
Log:whack whack whack until we get to the point of actually calling GC
stuff
diff --git a/rpython/memory/gc/incminimark.py b/rpyth
Author: Manuel Jacob
Branch: py3.5
Changeset: r92491:aee2981816b8
Date: 2017-09-28 21:48 +0200
http://bitbucket.org/pypy/pypy/changeset/aee2981816b8/
Log:hg merge default
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -60,8 +60,8 @@
Wim Lavrijsen
Eric van Riet Paap
Ri
Author: Manuel Jacob
Branch: py3.6
Changeset: r92492:2a061e98f19f
Date: 2017-09-28 22:24 +0200
http://bitbucket.org/pypy/pypy/changeset/2a061e98f19f/
Log:hg merge py3.5
diff too long, truncating to 2000 out of 33754 lines
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@
Author: Ronan Lamy
Branch:
Changeset: r92493:8c01f25c3440
Date: 2017-09-28 22:35 +0200
http://bitbucket.org/pypy/pypy/changeset/8c01f25c3440/
Log:Fix GCC warning caused by PySlice_GetIndicesEx()
diff --git a/pypy/module/cpyext/api.py b/pypy/module/cpyext/api.py
--- a/pypy/module/cpyext/api.
Author: Ronan Lamy
Branch:
Changeset: r92494:8e1aad229f8e
Date: 2017-09-28 22:59 +0200
http://bitbucket.org/pypy/pypy/changeset/8e1aad229f8e/
Log:Use C parser to define the PyXXXDescrObjects
diff --git a/pypy/module/cpyext/include/descrobject.h
b/pypy/module/cpyext/include/descrobject.h
--
Author: Ronan Lamy
Branch: py3.5
Changeset: r92495:9d4f0cdad713
Date: 2017-09-28 23:48 +0200
http://bitbucket.org/pypy/pypy/changeset/9d4f0cdad713/
Log:hg merge default
diff --git a/pypy/module/cpyext/api.py b/pypy/module/cpyext/api.py
--- a/pypy/module/cpyext/api.py
+++ b/pypy/module/cpyext
Author: Ronan Lamy
Branch: py3.5
Changeset: r92496:8b44bf979649
Date: 2017-09-29 00:18 +0200
http://bitbucket.org/pypy/pypy/changeset/8b44bf979649/
Log:fix merge
diff --git a/pypy/module/cpyext/api.py b/pypy/module/cpyext/api.py
--- a/pypy/module/cpyext/api.py
+++ b/pypy/module/cpyext/api.py
Author: Ronan Lamy
Branch: py3.5
Changeset: r92497:c88a0030175d
Date: 2017-09-29 00:34 +0200
http://bitbucket.org/pypy/pypy/changeset/c88a0030175d/
Log:Match CPython3.5's descrobject.h
diff --git a/pypy/module/cpyext/parse/cpyext_descrobject.h
b/pypy/module/cpyext/parse/cpyext_descrobject.h