summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2009-06-07 15:29:46 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2009-06-07 15:29:46 (GMT)
commitfe8a3d6eebd0143eefc616e4ec312439425a486d (patch)
tree17e4ded56749a27940a8ca76db2dad7c475cbb74 /Lib
parent2cfca7977e42f6ec034ffe0782f2f1ad7d1efe7f (diff)
downloadcpython-fe8a3d6eebd0143eefc616e4ec312439425a486d.zip
cpython-fe8a3d6eebd0143eefc616e4ec312439425a486d.tar.gz
cpython-fe8a3d6eebd0143eefc616e4ec312439425a486d.tar.bz2
Fix for issue 6202
Diffstat (limited to 'Lib')
-rw-r--r--Lib/locale.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/Lib/locale.py b/Lib/locale.py
index 479e1a9..f6d174c 100644
--- a/Lib/locale.py
+++ b/Lib/locale.py
@@ -536,10 +536,8 @@ def resetlocale(category=LC_ALL):
"""
_setlocale(category, _build_localename(getdefaultlocale()))
-if sys.platform in ('win32', 'darwin', 'mac'):
+if sys.platform.startswith("win"):
# 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