summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2003-07-23 00:30:11 (GMT)
committerTim Peters <tim.peters@gmail.com>2003-07-23 00:30:11 (GMT)
commit9390dd5b4aa5f32551ac9e5d9988930fbb8ad055 (patch)
tree1f810ea61c92956e553b70e14f29108c9be7cb7d /Lib
parent36f7e938f287adb4a5c00bb66c5479357dfa9c26 (diff)
downloadcpython-9390dd5b4aa5f32551ac9e5d9988930fbb8ad055.zip
cpython-9390dd5b4aa5f32551ac9e5d9988930fbb8ad055.tar.gz
cpython-9390dd5b4aa5f32551ac9e5d9988930fbb8ad055.tar.bz2
locale-restoration code: Don't leave comparison to None implicit. For
all I know, the original locale may be '' (I don't think that's possible, but ...), and if so we would certainly want to restore it.
Diffstat (limited to 'Lib')
-rwxr-xr-xLib/test/regrtest.py2
-rw-r--r--Lib/test/test_logging.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 12e65e5..6f6d0f0 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -331,7 +331,7 @@ def main(tests=None, testdir=None, verbose=0, quiet=0, generate=0,
else:
os.unlink(filename)
- sys.exit(len(bad) > 0)
+ #sys.exit(len(bad) > 0)
STDTESTS = [
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index a677edd..ef77e5e 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -483,7 +483,7 @@ def test_main():
try:
test_main_inner()
finally:
- if original_locale:
+ if original_locale is not None:
locale.setlocale(locale.LC_ALL, original_locale)
if __name__ == "__main__":