aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Rigo <arigo@tunes.org>2012-10-10 14:48:03 +0200
committerArmin Rigo <arigo@tunes.org>2012-10-10 14:48:03 +0200
commit2afff90e3f99cdadd5ebab948c028f8e85ce6fa2 (patch)
tree2a2b72d6f57cadb85c0fd322903b51408a10d6fa /pypy/module/_locale/interp_locale.py
parentNeeds a custom ErrorWrapper class to repr nicely instead of with escaping. (diff)
downloadpypy-2afff90e3f99cdadd5ebab948c028f8e85ce6fa2.tar.gz
pypy-2afff90e3f99cdadd5ebab948c028f8e85ce6fa2.tar.bz2
pypy-2afff90e3f99cdadd5ebab948c028f8e85ce6fa2.zip
(fijal, arigo)
in-progress: refactoring the NoneNotWrapped away, yay
Diffstat (limited to 'pypy/module/_locale/interp_locale.py')
-rw-r--r--pypy/module/_locale/interp_locale.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pypy/module/_locale/interp_locale.py b/pypy/module/_locale/interp_locale.py
index f3342fac67..b864d480a6 100644
--- a/pypy/module/_locale/interp_locale.py
+++ b/pypy/module/_locale/interp_locale.py
@@ -48,7 +48,7 @@ def _fixup_ulcase(space):
def setlocale(space, category, w_locale=None):
"(integer,string=None) -> string. Activates/queries locale processing."
- if space.is_w(w_locale, space.w_None) or w_locale is None:
+ if w_locale is None or space.is_w(w_locale, space.w_None):
locale = None
else:
locale = space.str_w(w_locale)