[pypy-svn] r74075 - pypy/trunk/lib-python/modified-2.5.2

[afa at codespeak.net]

Author: afa
Date: Mon Apr 26 15:08:36 2010
New Revision: 74075

Added:
   pypy/trunk/lib-python/modified-2.5.2/locale.py
      - copied, changed from r74074, pypy/trunk/lib-python/2.5.2/locale.py
Log:
Port CPython's issue6202: remove specific mac cases, darwin is a posix platform.


Copied: pypy/trunk/lib-python/modified-2.5.2/locale.py (from r74074, pypy/trunk/lib-python/2.5.2/locale.py)
==============================================================================
--- pypy/trunk/lib-python/2.5.2/locale.py	(original)
+++ pypy/trunk/lib-python/modified-2.5.2/locale.py	Mon Apr 26 15:08:36 2010
@@ -487,10 +487,8 @@
     """
     _setlocale(category, _build_localename(getdefaultlocale()))
 
-if sys.platform in ('win32', 'darwin', 'mac'):
+if sys.platform == 'win32':
     # On Win32, this will return the ANSI code page
-    # On the Mac, it should return the system encoding;
-    # it might return "ascii" instead
     def getpreferredencoding(do_setlocale = True):
         """Return the charset that the user is likely using."""
         import _locale