Author: Manuel Jacob <m...@manueljacob.de>
Branch: py3.5
Changeset: r95677:344c0186ad69
Date: 2019-01-20 11:58 +0100
http://bitbucket.org/pypy/pypy/changeset/344c0186ad69/
Log: hg merge default
diff --git a/pypy/module/gc/__init__.py b/pypy/module/gc/__init__.py
--- a/pypy/module/gc/__init__.py
+++ b/pypy/module/gc/__init__.py
@@ -4,7 +4,6 @@
class Module(MixedModule):
interpleveldefs = {
'collect': 'interp_gc.collect',
- 'collect_step': 'interp_gc.collect_step',
'enable': 'interp_gc.enable',
'disable': 'interp_gc.disable',
'isenabled': 'interp_gc.isenabled',
@@ -23,6 +22,7 @@
'get_stats': 'app_referents.get_stats',
})
self.interpleveldefs.update({
+ 'collect_step': 'interp_gc.collect_step',
'get_rpy_roots': 'referents.get_rpy_roots',
'get_rpy_referents': 'referents.get_rpy_referents',
'get_rpy_memory_usage': 'referents.get_rpy_memory_usage',
diff --git a/rpython/memory/gc/test/test_direct.py
b/rpython/memory/gc/test/test_direct.py
--- a/rpython/memory/gc/test/test_direct.py
+++ b/rpython/memory/gc/test/test_direct.py
@@ -774,7 +774,7 @@
def test_collect_0(self, debuglog):
self.gc.collect(1) # start a major
debuglog.reset()
- self.gc.collect(0) # do ONLY a minor
+ self.gc.collect(-1) # do ONLY a minor
assert debuglog.summary() == {'gc-minor': 1}
def test_enable_disable(self, debuglog):
diff --git a/rpython/rtyper/test/test_rdict.py
b/rpython/rtyper/test/test_rdict.py
--- a/rpython/rtyper/test/test_rdict.py
+++ b/rpython/rtyper/test/test_rdict.py
@@ -1,6 +1,7 @@
import sys
from contextlib import contextmanager
import signal
+from collections import OrderedDict
from rpython.translator.translator import TranslationContext
from rpython.annotator.model import (
@@ -1196,7 +1197,7 @@
DictValue(None, s_value))
dictrepr.setup()
self.l_dict = self.newdict(dictrepr)
- self.reference = self.new_reference()
+ self.reference = OrderedDict()
self.ll_key = r_key.convert_const
self.ll_value = r_value.convert_const
self.removed_keys = []
@@ -1323,7 +1324,6 @@
class DictSpace(MappingSpace):
MappingRepr = rdict.DictRepr
- new_reference = dict
ll_getitem = staticmethod(rdict.ll_dict_getitem)
ll_setitem = staticmethod(rdict.ll_dict_setitem)
ll_delitem = staticmethod(rdict.ll_dict_delitem)
diff --git a/rpython/rtyper/test/test_rordereddict.py
b/rpython/rtyper/test/test_rordereddict.py
--- a/rpython/rtyper/test/test_rordereddict.py
+++ b/rpython/rtyper/test/test_rordereddict.py
@@ -422,7 +422,6 @@
class ODictSpace(MappingSpace):
MappingRepr = rodct.OrderedDictRepr
- new_reference = OrderedDict
moved_around = False
ll_getitem = staticmethod(rodct.ll_dict_getitem)
ll_setitem = staticmethod(rodct.ll_dict_setitem)
diff --git a/rpython/translator/c/src/mem.h b/rpython/translator/c/src/mem.h
--- a/rpython/translator/c/src/mem.h
+++ b/rpython/translator/c/src/mem.h
@@ -112,6 +112,8 @@
#define OP_GC__DISABLE_FINALIZERS(r) boehm_gc_finalizer_lock++
#define OP_GC__ENABLE_FINALIZERS(r) (boehm_gc_finalizer_lock--, \
boehm_gc_finalizer_notifier())
+#define OP_GC__DISABLE(r) /* nothing */
+#define OP_GC__ENABLE(r) /* nothing */
#define OP_BOEHM_FQ_REGISTER(tagindex, obj, r) \
boehm_fq_register(boehm_fq_queues + tagindex, obj)
@@ -127,6 +129,8 @@
#define OP_BOEHM_DISAPPEARING_LINK(link, obj, r) /* nothing */
#define OP_GC__DISABLE_FINALIZERS(r) /* nothing */
#define OP_GC__ENABLE_FINALIZERS(r) /* nothing */
+#define OP_GC__DISABLE(r) /* nothing */
+#define OP_GC__ENABLE(r) /* nothing */
#define GC_REGISTER_FINALIZER(a, b, c, d, e) /* nothing */
#define GC_gcollect() /* nothing */
#define GC_set_max_heap_size(a) /* nothing */
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
