[pypy-svn] r69643 - in pypy/branch/force-arch-darwin: lib-python lib-python/2.5.2 lib-python/2.5.2/test lib-python/modified-2.5.2/test pypy/module/_locale pypy/module/_locale/test

[santagada at codespeak.net]

Author: santagada
Date: Thu Nov 26 00:57:18 2009
New Revision: 69643

Added:
   pypy/branch/force-arch-darwin/lib-python/2.5.2/test/test_locale.py
      - copied unchanged from r69622, pypy/branch/force-arch-darwin/lib-python/2.5.2/test/test_locale.py
Removed:
   pypy/branch/force-arch-darwin/lib-python/modified-2.5.2/test/test_locale.py
Modified:
   pypy/branch/force-arch-darwin/lib-python/2.5.2/locale.py
   pypy/branch/force-arch-darwin/lib-python/conftest.py
   pypy/branch/force-arch-darwin/pypy/module/_locale/__init__.py
   pypy/branch/force-arch-darwin/pypy/module/_locale/interp_locale.py
   pypy/branch/force-arch-darwin/pypy/module/_locale/test/test_locale.py
Log:
reverted 69623

Modified: pypy/branch/force-arch-darwin/lib-python/2.5.2/locale.py
==============================================================================
--- pypy/branch/force-arch-darwin/lib-python/2.5.2/locale.py	(original)
+++ pypy/branch/force-arch-darwin/lib-python/2.5.2/locale.py	Thu Nov 26 00:57:18 2009
@@ -30,7 +30,7 @@
     from _locale import *
 
 except ImportError:
-    raise
+
     # Locale emulation
 
     CHAR_MAX = 127

Modified: pypy/branch/force-arch-darwin/lib-python/conftest.py
==============================================================================
--- pypy/branch/force-arch-darwin/lib-python/conftest.py	(original)
+++ pypy/branch/force-arch-darwin/lib-python/conftest.py	Thu Nov 26 00:57:18 2009
@@ -282,7 +282,7 @@
     RegrTest('test_largefile.py'),
     RegrTest('test_linuxaudiodev.py', skip="unsupported extension module"),
     RegrTest('test_list.py', core=True),
-    RegrTest('test_locale.py', usemodules='_rawffi'),
+    RegrTest('test_locale.py'),
     RegrTest('test_logging.py', usemodules='thread'),
     RegrTest('test_long.py', core=True),
     RegrTest('test_long_future.py', core=True),

Modified: pypy/branch/force-arch-darwin/pypy/module/_locale/__init__.py
==============================================================================
--- pypy/branch/force-arch-darwin/pypy/module/_locale/__init__.py	(original)
+++ pypy/branch/force-arch-darwin/pypy/module/_locale/__init__.py	Thu Nov 26 00:57:18 2009
@@ -12,7 +12,7 @@
             'strxfrm':                  'interp_locale.strxfrm',
             }
 
-    if sys.platform == 'win32':
+    if sys.platform in ('win32', 'darwin'):
         interpleveldefs.update({
             '_getdefaultlocale':        'interp_locale.getdefaultlocale',
             })

Modified: pypy/branch/force-arch-darwin/pypy/module/_locale/interp_locale.py
==============================================================================
--- pypy/branch/force-arch-darwin/pypy/module/_locale/interp_locale.py	(original)
+++ pypy/branch/force-arch-darwin/pypy/module/_locale/interp_locale.py	Thu Nov 26 00:57:18 2009
@@ -21,15 +21,8 @@
         includes += ['libintl.h']
     if sys.platform == 'win32':
         includes += ['windows.h']
-
-    if sys.platform == 'darwin':
-        libraries = ['intl']
-    else:
-        libraries = []
-
     _compilation_info_ = ExternalCompilationInfo(
         includes=includes,
-        libraries=libraries
     )
     HAVE_BIND_TEXTDOMAIN_CODESET = platform.Has('bind_textdomain_codeset')
     lconv = platform.Struct("struct lconv", [
@@ -106,11 +99,8 @@
     # should we support them?
     langinfo_names.extend('RADIXCHAR THOUSEP CRNCYSTR D_T_FMT D_FMT T_FMT '
                         'AM_STR PM_STR CODESET T_FMT_AMPM ERA ERA_D_FMT '
-                        'ERA_D_T_FMT ERA_T_FMT ALT_DIGITS YESEXPR '
-                        'NOEXPR'.split())
-    _DATE_FMT = platform.SimpleType('_DATE_FMT', ifdef='_DATE_FMT')
-    if _DATE_FMT:
-        langinfo_names.append('_DATE_FMT')
+                        'ERA_D_T_FMT ERA_T_FMT ALT_DIGITS YESEXPR NOEXPR '
+                        '_DATE_FMT'.split())
     for i in range(1, 8):
         langinfo_names.append("DAY_%d" % i)
         langinfo_names.append("ABDAY_%d" % i)
@@ -465,3 +455,5 @@
         finally:
             lltype.free(buf_lang, flavor='raw')
             lltype.free(buf_country, flavor='raw')
+elif sys.platform == 'darwin':
+    raise NotImplementedError()

Modified: pypy/branch/force-arch-darwin/pypy/module/_locale/test/test_locale.py
==============================================================================
--- pypy/branch/force-arch-darwin/pypy/module/_locale/test/test_locale.py	(original)
+++ pypy/branch/force-arch-darwin/pypy/module/_locale/test/test_locale.py	Thu Nov 26 00:57:18 2009
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import py
 from pypy.conftest import gettestobjspace
-# from pypy.rpython.tool import rffi_platform as platform
+
 import sys
 
 class AppTestLocaleTrivia:
@@ -65,16 +65,11 @@
 
 
         # HAVE_LANGINFO
-
         if sys.platform != 'win32':
             _LANGINFO_NAMES = ('RADIXCHAR THOUSEP CRNCYSTR D_T_FMT D_FMT '
                         'T_FMT AM_STR PM_STR CODESET T_FMT_AMPM ERA ERA_D_FMT '
-                        'ERA_D_T_FMT ERA_T_FMT ALT_DIGITS YESEXPR '
-                        'NOEXPR').split()
-            # XXX don't know how to conditionally test this.
-            #_DATE_FMT = platform.SimpleType('_DATE_FMT', ifdef='_DATE_FMT')
-            #if _DATE_FMT:
-            #langinfo_names.append('_DATE_FMT')
+                        'ERA_D_T_FMT ERA_T_FMT ALT_DIGITS YESEXPR NOEXPR '
+                        '_DATE_FMT').split()
             for i in range(1, 8):
                 _LANGINFO_NAMES.append("DAY_%d" % i)
                 _LANGINFO_NAMES.append("ABDAY_%d" % i)