[pypy-svn] r68262 - in pypy/trunk/pypy/module/unicodedata: . test

[cfbolz at codespeak.net]

Author: cfbolz
Date: Thu Oct  8 23:48:04 2009
New Revision: 68262

Modified:
   pypy/trunk/pypy/module/unicodedata/interp_ucd.py
   pypy/trunk/pypy/module/unicodedata/test/test_unicodedata.py
Log:
issue452 resolved

apply (a variant of) haypo's patch. Thanks.


Modified: pypy/trunk/pypy/module/unicodedata/interp_ucd.py
==============================================================================
--- pypy/trunk/pypy/module/unicodedata/interp_ucd.py	(original)
+++ pypy/trunk/pypy/module/unicodedata/interp_ucd.py	Thu Oct  8 23:48:04 2009
@@ -147,7 +147,7 @@
 
     def normalize(self, space, form, w_unistr):
         if not space.is_true(space.isinstance(w_unistr, space.w_unicode)):
-            raise TypeError, 'argument 2 must be unicode'
+            raise OperationError(space.w_TypeError, space.wrap('argument 2 must be unicode'))
         if form == 'NFC':
             composed = True
             decomposition = self._canon_decomposition

Modified: pypy/trunk/pypy/module/unicodedata/test/test_unicodedata.py
==============================================================================
--- pypy/trunk/pypy/module/unicodedata/test/test_unicodedata.py	(original)
+++ pypy/trunk/pypy/module/unicodedata/test/test_unicodedata.py	Thu Oct  8 23:48:04 2009
@@ -78,6 +78,10 @@
         if sys.maxunicode == 65535:
             raises(KeyError, unicodedata.lookup, "GOTHIC LETTER FAIHU")
 
+    def test_normalize(self):
+        import unicodedata
+        raises(TypeError, unicodedata.normalize, 'x')
+
 class TestUnicodeData(object):
     def setup_class(cls):
         import random, unicodedata
@@ -169,3 +173,5 @@
         raises(KeyError, unicodedb_4_1_0.lookup, 'BENZENE RING WITH CIRCLE')
         raises(KeyError, unicodedb_3_2_0.name, 9187)
         raises(KeyError, unicodedb_4_1_0.name, 9187)
+
+