[pypy-svn] r73820 - in pypy/trunk/pypy/rlib: . rsre rsre/test test

[fijal at codespeak.net]

Author: fijal
Date: Fri Apr 16 22:48:28 2010
New Revision: 73820

Removed:
   pypy/trunk/pypy/rlib/rsre/_rsre_platform.py
   pypy/trunk/pypy/rlib/rsre/test/test_rsre_platform.py
Modified:
   pypy/trunk/pypy/rlib/rlocale.py
   pypy/trunk/pypy/rlib/rsre/rsre_char.py
   pypy/trunk/pypy/rlib/test/test_rlocale.py
Log:
Add a couple more primitives to rlocale. Use it in rsre (keep the mess
contained, eh)


Modified: pypy/trunk/pypy/rlib/rlocale.py
==============================================================================
--- pypy/trunk/pypy/rlib/rlocale.py	(original)
+++ pypy/trunk/pypy/rlib/rlocale.py	Fri Apr 16 22:48:28 2010
@@ -161,3 +161,5 @@
 isalpha = external('isalpha', [rffi.INT], rffi.INT)
 isupper = external('isupper', [rffi.INT], rffi.INT)
 islower = external('islower', [rffi.INT], rffi.INT)
+tolower = external('tolower', [rffi.INT], rffi.INT)
+isalnum = external('isalnum', [rffi.INT], rffi.INT)

Modified: pypy/trunk/pypy/rlib/rsre/rsre_char.py
==============================================================================
--- pypy/trunk/pypy/rlib/rsre/rsre_char.py	(original)
+++ pypy/trunk/pypy/rlib/rsre/rsre_char.py	Fri Apr 16 22:48:28 2010
@@ -2,7 +2,7 @@
 Character categories and charsets.
 """
 import sys
-from pypy.rlib.rsre._rsre_platform import tolower, isalnum
+from pypy.rlib.rlocale import tolower, isalnum
 from pypy.rlib.unroll import unrolling_iterable
 
 # Note: the unicode parts of this module require you to call

Modified: pypy/trunk/pypy/rlib/test/test_rlocale.py
==============================================================================
--- pypy/trunk/pypy/rlib/test/test_rlocale.py	(original)
+++ pypy/trunk/pypy/rlib/test/test_rlocale.py	Fri Apr 16 22:48:28 2010
@@ -4,7 +4,7 @@
 import py
 import locale as cpython_locale
 from pypy.rlib.rlocale import setlocale, LC_ALL, LocaleError, isupper, \
-     islower, isalpha
+     islower, isalpha, tolower, isalnum
 
 class TestLocale(object):
     def setup_class(cls):
@@ -25,4 +25,6 @@
         assert isupper(ord("A"))
         assert islower(ord("a"))
         assert not isalpha(ord(" "))
+        assert isalnum(ord("1"))
+        assert tolower(ord("A")) == ord("a")