Author: Armin Rigo <[email protected]>
Branch: py3k-kwonly-builtin
Changeset: r86360:97a36a112c3c
Date: 2016-08-20 19:45 +0200
http://bitbucket.org/pypy/pypy/changeset/97a36a112c3c/
Log: hg merge py3k
diff --git a/pypy/objspace/std/test/test_dictmultiobject.py
b/pypy/objspace/std/test/test_dictmultiobject.py
--- a/pypy/objspace/std/test/test_dictmultiobject.py
+++ b/pypy/objspace/std/test/test_dictmultiobject.py
@@ -1282,7 +1282,7 @@
assert a == self.string2
assert b == 2000
if not self._str_devolves:
- result = self.impl.getitem_str(self.string)
+ result = self.impl.getitem_str(self.string.encode('utf-8'))
else:
result = self.impl.getitem(self.string)
assert result == 1000
@@ -1293,7 +1293,7 @@
assert self.impl.length() == 1
assert self.impl.getitem(self.string) == 1000
if not self._str_devolves:
- result = self.impl.getitem_str(self.string)
+ result = self.impl.getitem_str(self.string.encode('utf-8'))
else:
result = self.impl.getitem(self.string)
assert result == 1000
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
