Author: Brian Kearns <bdkea...@gmail.com>
Branch: 
Changeset: r60537:ce89f6bbee1e
Date: 2013-01-27 13:58 -0500
http://bitbucket.org/pypy/pypy/changeset/ce89f6bbee1e/

Log:    merge

diff --git a/rpython/rlib/runicode.py b/rpython/rlib/runicode.py
--- a/rpython/rlib/runicode.py
+++ b/rpython/rlib/runicode.py
@@ -31,7 +31,8 @@
         ch2 = ord(u[1])
         if 0xD800 <= ch1 <= 0xDBFF and 0xDC00 <= ch2 <= 0xDFFF:
             return (((ch1 - 0xD800) << 10) | (ch2 - 0xDC00)) + 0x10000
-    return ord(u)
+    assert len(u) == 1
+    return ord(u[0])
 
 if MAXUNICODE > sys.maxunicode:
     # A version of unichr which allows codes outside the BMP
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to