Author: Antonio Cuni
Branch: gc-hooks
Changeset: r94312:f157561218b4
Date: 2018-04-12 18:03 +0200
http://bitbucket.org/pypy/pypy/changeset/f157561218b4/
Log:hg merge default
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -6,36 +6,36 @@
Except when otherwise stated (look for L
Author: Armin Rigo
Branch: py3.5
Changeset: r94311:4db4624409b4
Date: 2018-04-12 10:25 +0100
http://bitbucket.org/pypy/pypy/changeset/4db4624409b4/
Log:Issue #2768: rare case involving __del__ methods
diff --git a/pypy/interpreter/pyopcode.py b/pypy/interpreter/pyopcode.py
--- a/pypy/interpr
Author: Armin Rigo
Branch:
Changeset: r94310:ce764b945eeb
Date: 2018-04-12 10:30 +0200
http://bitbucket.org/pypy/pypy/changeset/ce764b945eeb/
Log:Fix
diff --git a/rpython/rlib/rgc.py b/rpython/rlib/rgc.py
--- a/rpython/rlib/rgc.py
+++ b/rpython/rlib/rgc.py
@@ -644,7 +644,10 @@
def get_rpy_
Author: Armin Rigo
Branch:
Changeset: r94309:0cb72dae7486
Date: 2018-04-12 09:39 +0200
http://bitbucket.org/pypy/pypy/changeset/0cb72dae7486/
Log:Issue #2768
Fall back to not using _py3k_acquire(), in case eventlet patches
various classes
diff --git a/lib-python/2.7/threadi
Author: Armin Rigo
Branch:
Changeset: r94308:0dafeea23cbb
Date: 2018-04-12 09:33 +0200
http://bitbucket.org/pypy/pypy/changeset/0dafeea23cbb/
Log:Issue #2797
Fix for PySet_Discard()
diff --git a/pypy/module/cpyext/setobject.py b/pypy/module/cpyext/setobject.py
--- a/pypy/module/cpy