Author: Matti Picus <[email protected]>
Branch: py3.6
Changeset: r96106:c73741830344
Date: 2019-02-20 09:46 +0200
http://bitbucket.org/pypy/pypy/changeset/c73741830344/
Log: fix translation and fix failing test
diff --git a/pypy/interpreter/mixedmodule.py b/pypy/interpreter/mixedmodule.py
--- a/pypy/interpreter/mixedmodule.py
+++ b/pypy/interpreter/mixedmodule.py
@@ -198,7 +198,7 @@
return space.newtext_or_none(cls.__doc__)
def setdictvalue_dont_introduce_cell(self, name, w_value):
- """ inofficial interface on MixedModules to override an existing value
+ """ unofficial interface in MixedModules to override an existing value
in the module but without introducing a cell (in the sense of
celldict.py) for it. Should be used sparingly, since it will trigger a
JIT recompile of all code that uses this module."""
diff --git a/pypy/interpreter/test/test_unicodehelper.py
b/pypy/interpreter/test/test_unicodehelper.py
--- a/pypy/interpreter/test/test_unicodehelper.py
+++ b/pypy/interpreter/test/test_unicodehelper.py
@@ -56,7 +56,7 @@
assert s[start:end] in [u'\udc80', u'\uD800\uDFFF']
return '', start, 'b'
- assert pytest.raises(IndexError, utf8_encode_utf_8, u, 'strict',
+ assert pytest.raises(Exception, utf8_encode_utf_8, u, 'strict',
errorhandler=errorhandler, allow_surrogates=False)
def test_decode_utf8sp():
diff --git a/pypy/objspace/std/celldict.py b/pypy/objspace/std/celldict.py
--- a/pypy/objspace/std/celldict.py
+++ b/pypy/objspace/std/celldict.py
@@ -195,8 +195,7 @@
dict_w = strategy.unerase(w_dict.dstorage)
strategy.mutated()
dict_w[name] = w_value # store without cell
- return
- w_obj.setdictvalue(space, name, w_value)
+ # nothing to do, not a W_DictMultiObject or wrong strategy
create_iterator_classes(ModuleDictStrategy)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
