Author: Philip Jenvey <[email protected]>
Branch: py3k
Changeset: r72428:bf8917ab2b8a
Date: 2014-07-12 14:48 -0700
http://bitbucket.org/pypy/pypy/changeset/bf8917ab2b8a/
Log: merge upstream
diff --git a/pypy/goal/targetpypystandalone.py
b/pypy/goal/targetpypystandalone.py
--- a/pypy/goal/targetpypystandalone.py
+++ b/pypy/goal/targetpypystandalone.py
@@ -55,7 +55,7 @@
space.startup()
if rlocale.HAVE_LANGINFO:
try:
- rlocale.setlocale(rlocale.LC_ALL, '')
+ rlocale.setlocale(rlocale.LC_CTYPE, '')
except rlocale.LocaleError:
pass
w_executable = space.fsdecode(space.wrapbytes(argv[0]))
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
