[Python-checkins] r81363 - in python/branches/release31-maint: Lib/distutils/log.py Lib/distutils/tests/test_log.py Lib/test/regrtest.py Misc/NEWS
victor.stinner
python-checkins at python.org
Wed May 19 22:30:19 CEST 2010
Author: victor.stinner
Date: Wed May 19 22:30:19 2010
New Revision: 81363
Log:
Merged revisions 81359-81361 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r81359 | victor.stinner | 2010-05-19 19:00:07 +0200 (mer., 19 mai 2010) | 4 lines
Issue #8663: distutils.log emulates backslashreplace error handler. Fix
compilation in a non-ASCII directory if stdout encoding is ASCII (eg. if stdout
is not a TTY).
........
r81360 | victor.stinner | 2010-05-19 19:11:19 +0200 (mer., 19 mai 2010) | 5 lines
regrtest.py: call replace_stdout() before the first call to print()
print("== ", os.getcwd()) fails if the current working directory is not ASCII
whereas sys.stdout encoding is ASCII.
........
r81361 | victor.stinner | 2010-05-19 19:15:50 +0200 (mer., 19 mai 2010) | 2 lines
Oops, add the new test_log.py for distutils test suite (missing part of r81359)
........
Added:
python/branches/release31-maint/Lib/distutils/tests/test_log.py
Modified:
python/branches/release31-maint/ (props changed)
python/branches/release31-maint/Lib/distutils/log.py
python/branches/release31-maint/Lib/test/regrtest.py
python/branches/release31-maint/Misc/NEWS
Modified: python/branches/release31-maint/Lib/distutils/log.py
==============================================================================
--- python/branches/release31-maint/Lib/distutils/log.py (original)
+++ python/branches/release31-maint/Lib/distutils/log.py Wed May 19 22:30:19 2010
@@ -27,6 +27,10 @@
stream = sys.stderr
else:
stream = sys.stdout
+ if stream.errors == 'strict':
+ # emulate backslashreplace error handler
+ encoding = stream.encoding
+ msg = msg.encode(encoding, "backslashreplace").decode(encoding)
stream.write('%s\n' % msg)
stream.flush()
Added: python/branches/release31-maint/Lib/distutils/tests/test_log.py
==============================================================================
--- (empty file)
+++ python/branches/release31-maint/Lib/distutils/tests/test_log.py Wed May 19 22:30:19 2010
@@ -0,0 +1,36 @@
+"""Tests for distutils.log"""
+
+import sys
+import unittest
+from tempfile import NamedTemporaryFile
+
+from distutils import log
+
+class TestLog(unittest.TestCase):
+ def test_non_ascii(self):
+ # Issue #8663: test that non-ASCII text is escaped with
+ # backslashreplace error handler (stream use ASCII encoding and strict
+ # error handler)
+ old_stdout = sys.stdout
+ old_stderr = sys.stderr
+ try:
+ log.set_threshold(log.DEBUG)
+ with NamedTemporaryFile(mode="w+", encoding='ascii') as stdout, \
+ NamedTemporaryFile(mode="w+", encoding='ascii') as stderr:
+ sys.stdout = stdout
+ sys.stderr = stderr
+ log.debug("debug:\xe9")
+ log.fatal("fatal:\xe9")
+ stdout.seek(0)
+ self.assertEquals(stdout.read().rstrip(), "debug:\\xe9")
+ stderr.seek(0)
+ self.assertEquals(stderr.read().rstrip(), "fatal:\\xe9")
+ finally:
+ sys.stdout = old_stdout
+ sys.stderr = old_stderr
+
+def test_suite():
+ return unittest.makeSuite(TestLog)
+
+if __name__ == "__main__":
+ unittest.main(defaultTest="test_suite")
Modified: python/branches/release31-maint/Lib/test/regrtest.py
==============================================================================
--- python/branches/release31-maint/Lib/test/regrtest.py (original)
+++ python/branches/release31-maint/Lib/test/regrtest.py Wed May 19 22:30:19 2010
@@ -215,6 +215,8 @@
on the command line.
"""
+ replace_stdout()
+
support.record_original_stdout(sys.stdout)
try:
opts, args = getopt.getopt(sys.argv[1:], 'hvgqxsSrf:lu:t:TD:NLR:wM:n',
@@ -411,7 +413,6 @@
support.verbose = verbose # Tell tests to be moderately quiet
support.use_resources = use_resources
save_modules = sys.modules.keys()
- replace_stdout()
for test in tests:
if not quiet:
print(test)
Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS (original)
+++ python/branches/release31-maint/Misc/NEWS Wed May 19 22:30:19 2010
@@ -43,6 +43,10 @@
Library
-------
+- Issue #8663: distutils.log emulates backslashreplace error handler. Fix
+ compilation in a non-ASCII directory if stdout encoding is ASCII (eg. if
+ stdout is not a TTY).
+
- Issue #8688: Distutils now recalculates MANIFEST everytime.
- Issue #5099: subprocess.Popen.__del__ no longer references global objects
More information about the Python-checkins
mailing list