Author: Amaury Forgeot d'Arc <[email protected]>
Branch: py3k
Changeset: r63722:85b7df90925f
Date: 2013-04-28 17:00 +0200
http://bitbucket.org/pypy/pypy/changeset/85b7df90925f/
Log: with pypy int("\ud800") does not raise UnicodeError, because no utf8
conversion is needed. ValueError is just as good.
diff --git a/lib-python/3/test/test_float.py b/lib-python/3/test/test_float.py
--- a/lib-python/3/test/test_float.py
+++ b/lib-python/3/test/test_float.py
@@ -42,7 +42,7 @@
self.assertRaises(ValueError, float, b"-")
self.assertRaises(TypeError, float, {})
# Lone surrogate
- self.assertRaises(UnicodeEncodeError, float, '\uD8F0')
+ self.assertRaises((UnicodeEncodeError, ValueError), float, '\uD8F0')
# check that we don't accept alternate exponent markers
self.assertRaises(ValueError, float, "-1.7d29")
self.assertRaises(ValueError, float, "3D-14")
diff --git a/lib-python/3/test/test_unicode.py
b/lib-python/3/test/test_unicode.py
--- a/lib-python/3/test/test_unicode.py
+++ b/lib-python/3/test/test_unicode.py
@@ -1354,12 +1354,12 @@
self.assertRaises(TypeError, "hello".encode, 42, 42, 42)
# Error handling (lone surrogate in
PyUnicode_TransformDecimalToASCII())
- self.assertRaises(UnicodeError, int, "\ud800")
- self.assertRaises(UnicodeError, int, "\udf00")
- self.assertRaises(UnicodeError, float, "\ud800")
- self.assertRaises(UnicodeError, float, "\udf00")
- self.assertRaises(UnicodeError, complex, "\ud800")
- self.assertRaises(UnicodeError, complex, "\udf00")
+ self.assertRaises((UnicodeError, ValueError), int, "\ud800")
+ self.assertRaises((UnicodeError, ValueError), int, "\udf00")
+ self.assertRaises((UnicodeError, ValueError), float, "\ud800")
+ self.assertRaises((UnicodeError, ValueError), float, "\udf00")
+ self.assertRaises((UnicodeError, ValueError), complex, "\ud800")
+ self.assertRaises((UnicodeError, ValueError), complex, "\udf00")
def test_codecs(self):
# Encoding
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
