[pypy-commit] pypy py3.6: a few test methods were duplicated (merge problem?)

[cfbolz]

Author: Carl Friedrich Bolz-Tereick <cfb...@gmx.de>
Branch: py3.6
Changeset: r96162:7fd78ec00476
Date: 2019-02-25 12:50 +0100
http://bitbucket.org/pypy/pypy/changeset/7fd78ec00476/

Log:    a few test methods were duplicated (merge problem?)

diff --git a/pypy/objspace/std/test/test_unicodeobject.py 
b/pypy/objspace/std/test/test_unicodeobject.py
--- a/pypy/objspace/std/test/test_unicodeobject.py
+++ b/pypy/objspace/std/test/test_unicodeobject.py
@@ -1277,28 +1277,6 @@
         assert u'A\u03a3\u0345'.lower() == u'a\u03c2\u0345'
         assert u'\u03a3\u0345 '.lower() == u'\u03c3\u0345 '
 
-    def test_encode_wrong_errors(self):
-        assert ''.encode(errors='some_wrong_name') == b''
-
-    def test_casefold(self):
-        assert u'hello'.casefold() == u'hello'
-        assert u'hELlo'.casefold() == u'hello'
-        assert u'&#223;'.casefold() == u'ss'
-        assert u'&#64257;'.casefold() == u'fi'
-        assert u'\u03a3'.casefold() == u'\u03c3'
-        assert u'A\u0345\u03a3'.casefold() == u'a\u03b9\u03c3'
-        assert u'\u00b5'.casefold() == u'\u03bc'
-
-    def test_lower_3a3(self):
-        # Special case for GREEK CAPITAL LETTER SIGMA U+03A3
-        assert u'\u03a3'.lower() == u'\u03c3'
-        assert u'\u0345\u03a3'.lower() == u'\u0345\u03c3'
-        assert u'A\u0345\u03a3'.lower() == u'a\u0345\u03c2'
-        assert u'A\u0345\u03a3a'.lower() == u'a\u0345\u03c3a'
-        assert u'A\u0345\u03a3'.lower() == u'a\u0345\u03c2'
-        assert u'A\u03a3\u0345'.lower() == u'a\u03c2\u0345'
-        assert u'\u03a3\u0345 '.lower() == u'\u03c3\u0345 '
-
     def test_unicode_constructor_misc(self):
         x = u'foo'
         x += u'bar'
@@ -1347,4 +1325,4 @@
 
 
     def test_newlist_utf8_non_ascii(self):
-        '&#228;'.split("\n")[0] # does not crash
\ No newline at end of file
+        '&#228;'.split("\n")[0] # does not crash
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit