[pypy-svn] r71857 - in pypy/branch/ctypes-configure-cache-2/pypy/lib: . ctypes_config_cache

arigo at codespeak.net arigo at codespeak.net
Sat Mar 6 13:10:33 CET 2010


Author: arigo
Date: Sat Mar  6 13:10:31 2010
New Revision: 71857

Modified:
   pypy/branch/ctypes-configure-cache-2/pypy/lib/_locale.py
   pypy/branch/ctypes-configure-cache-2/pypy/lib/ctypes_config_cache/locale.ctc.py
Log:
Fixes found by the previous test fix.


Modified: pypy/branch/ctypes-configure-cache-2/pypy/lib/_locale.py
==============================================================================
--- pypy/branch/ctypes-configure-cache-2/pypy/lib/_locale.py	(original)
+++ pypy/branch/ctypes-configure-cache-2/pypy/lib/_locale.py	Sat Mar  6 13:10:31 2010
@@ -314,9 +314,8 @@
     'setlocale', 'localeconv', 'strxfrm', 'strcoll',
     'gettext', 'dgettext', 'dcgettext', 'textdomain',
     'bindtextdomain', 'CHAR_MAX',
-) + _CONSTANTS + tuple(langinfo_names)
+) + ALL_CONSTANTS
 if _bind_textdomain_codeset:
     __all__ += ('bind_textdomain_codeset',)
 if HAS_LANGINFO:
     __all__ += ('nl_langinfo',)
-

Modified: pypy/branch/ctypes-configure-cache-2/pypy/lib/ctypes_config_cache/locale.ctc.py
==============================================================================
--- pypy/branch/ctypes-configure-cache-2/pypy/lib/ctypes_config_cache/locale.ctc.py	(original)
+++ pypy/branch/ctypes-configure-cache-2/pypy/lib/ctypes_config_cache/locale.ctc.py	Sat Mar  6 13:10:31 2010
@@ -10,7 +10,7 @@
 
 # ____________________________________________________________
 
-_CONSTANTS = [
+_CONSTANTS = (
     'LC_CTYPE',
     'LC_NUMERIC',
     'LC_TIME',
@@ -24,7 +24,7 @@
     'LC_TELEPHONE',
     'LC_MEASUREMENT',
     'LC_IDENTIFICATION',
-]
+)
 
 class LocaleConfigure:
     _compilation_info_ = ExternalCompilationInfo(includes=['locale.h'])
@@ -55,9 +55,10 @@
         setattr(LanginfoConfigure, key, ConstantInteger(key))
 
     config.update(configure(LanginfoConfigure))
+    _CONSTANTS = _CONSTANTS + tuple(langinfo_names)
 
 # ____________________________________________________________
 
-config['_CONSTANTS'] = _CONSTANTS
+config['ALL_CONSTANTS'] = _CONSTANTS
 config['HAS_LANGINFO'] = HAS_LANGINFO
 dumpcache(__file__, '_locale_cache.py', config)



More information about the Pypy-commit mailing list