[pypy-commit] pypy py3.3: Redo 62fc05632b25: unicodedata 6.2.0 for Python 3.3

[amauryfa]

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.3
Changeset: r72127:3400f9076823
Date: 2014-06-20 22:27 +0200
http://bitbucket.org/pypy/pypy/changeset/3400f9076823/

Log:	Redo 62fc05632b25: unicodedata 6.2.0 for Python 3.3

diff --git a/pypy/module/unicodedata/__init__.py b/pypy/module/unicodedata/__init__.py
--- a/pypy/module/unicodedata/__init__.py
+++ b/pypy/module/unicodedata/__init__.py
@@ -3,7 +3,7 @@
 # This is the default unicodedb used in various places:
 # - the unicode type
 # - the regular expression engine
-from rpython.rlib.unicodedata import unicodedb_6_0_0 as unicodedb
+from rpython.rlib.unicodedata import unicodedb_6_2_0 as unicodedb
 
 # to get information about individual unicode chars look at:
 # http://www.fileformat.info/info/unicode/char/search.htm
@@ -14,7 +14,7 @@
     interpleveldefs = {
         'unidata_version' : 'space.wrap(interp_ucd.ucd.version)',
         'ucd_3_2_0'       : 'space.wrap(interp_ucd.ucd_3_2_0)',
-        'ucd_6_0_0'       : 'space.wrap(interp_ucd.ucd_6_0_0)',
+        'ucd_6_0_0'       : 'space.wrap(interp_ucd.ucd_6_2_0)',
         'ucd'             : 'space.wrap(interp_ucd.ucd)',
         '__doc__'         : "space.wrap('unicode character database')",
     }
diff --git a/pypy/module/unicodedata/interp_ucd.py b/pypy/module/unicodedata/interp_ucd.py
--- a/pypy/module/unicodedata/interp_ucd.py
+++ b/pypy/module/unicodedata/interp_ucd.py
@@ -9,7 +9,7 @@
 from rpython.rlib.rarithmetic import r_longlong
 from rpython.rlib.objectmodel import we_are_translated
 from rpython.rlib.runicode import MAXUNICODE
-from rpython.rlib.unicodedata import unicodedb_6_0_0, unicodedb_3_2_0
+from rpython.rlib.unicodedata import unicodedb_6_2_0, unicodedb_3_2_0
 from rpython.rlib.runicode import code_to_unichr, ord_accepts_surrogate
 import sys
 
@@ -324,5 +324,5 @@
                       **methods)
 
 ucd_3_2_0 = UCD(unicodedb_3_2_0)
-ucd_6_0_0 = UCD(unicodedb_6_0_0)
-ucd = ucd_6_0_0
+ucd_6_2_0 = UCD(unicodedb_6_2_0)
+ucd = ucd_6_2_0