Author: Matti Picus <matti.pi...@gmail.com>
Branch: py3.5
Changeset: r91637:8474e41c4b75
Date: 2017-06-22 23:23 +0300
http://bitbucket.org/pypy/pypy/changeset/8474e41c4b75/
Log: fix merge
diff --git a/pypy/module/cpyext/dictobject.py b/pypy/module/cpyext/dictobject.py
--- a/pypy/module/cpyext/dictobject.py
+++ b/pypy/module/cpyext/dictobject.py
@@ -286,7 +286,6 @@
pvalue[0] = as_pyobj(space, w_value)
return 1
- _frozendict_cache[space].flag_map_or_seq = 'M'
@cpython_api([PyObject], rffi.INT_real, error=CANNOT_FAIL)
def _PyDict_HasOnlyStringKeys(space, w_dict):
keys_w = space.unpackiterable(w_dict)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
