mirror of
https://github.com/python/cpython.git
synced 2025-08-31 14:07:50 +00:00
Merged revisions 80178 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r80178 | ronald.oussoren | 2010-04-18 15:47:49 +0200 (Sun, 18 Apr 2010) | 2 lines Fix for issue #7072 ........
This commit is contained in:
parent
d61deca27c
commit
501aeffba3
3 changed files with 22 additions and 2 deletions
|
@ -8,7 +8,15 @@ enUS_locale = None
|
|||
|
||||
def get_enUS_locale():
|
||||
global enUS_locale
|
||||
if sys.platform.startswith("win"):
|
||||
if sys.platform == 'darwin':
|
||||
import os
|
||||
tlocs = ("en_US.UTF-8", "en_US.ISO8859-1", "en_US")
|
||||
if int(os.uname()[2].split('.')[0]) < 10:
|
||||
# The locale test work fine on OSX 10.6, I (ronaldoussoren)
|
||||
# haven't had time yet to verify if tests work on OSX 10.5
|
||||
# (10.4 is known to be bad)
|
||||
raise unittest.SkipTest("Locale support on MacOSX is minimal")
|
||||
elif sys.platform.startswith("win"):
|
||||
tlocs = ("En", "English")
|
||||
else:
|
||||
tlocs = ("en_US.UTF-8", "en_US.ISO8859-1", "en_US.US-ASCII", "en_US")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue