Author: Manuel Jacob Branch: Changeset: r68778:1f4ae51fadd0 Date: 2014-01-20 12:43 +0100 http://bitbucket.org/pypy/pypy/changeset/1f4ae51fadd0/
Log: hg merge diff --git a/rpython/rlib/test/test_runicode.py b/rpython/rlib/test/test_runicode.py --- a/rpython/rlib/test/test_runicode.py +++ b/rpython/rlib/test/test_runicode.py @@ -99,7 +99,7 @@ called[0] += 1 if called[0] == 1: assert errors == "foo!" - assert enc == encoding + assert enc == encoding.replace('-', '') assert t is s assert start == startingpos assert stop == endingpos _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit