Mercurial > cpython-lru_cache-weakref
changeset 71808:fdfd1d67d9fb
merge from 3.2
| author | Senthil Kumaran <senthil@uthcode.com> |
|---|---|
| date | Thu, 11 Aug 2011 09:25:45 +0800 |
| parents | 1b4fae183da3 (current diff) 23316468ed4f (diff) |
| children | 5b2455d6cfe9 |
| files | Misc/NEWS |
| diffstat | 3 files changed, 16 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Lib/calendar.py Tue Aug 09 18:48:02 2011 -0500 +++ b/Lib/calendar.py Thu Aug 11 09:25:45 2011 +0800 @@ -636,7 +636,7 @@ parser.add_option( "-e", "--encoding", dest="encoding", default=None, - help="Encoding to use for output" + help="Encoding to use for output." ) parser.add_option( "-t", "--type", @@ -662,10 +662,11 @@ if encoding is None: encoding = sys.getdefaultencoding() optdict = dict(encoding=encoding, css=options.css) + write = sys.stdout.buffer.write if len(args) == 1: - print(cal.formatyearpage(datetime.date.today().year, **optdict)) + write(cal.formatyearpage(datetime.date.today().year, **optdict)) elif len(args) == 2: - print(cal.formatyearpage(int(args[1]), **optdict)) + write(cal.formatyearpage(int(args[1]), **optdict)) else: parser.error("incorrect number of arguments") sys.exit(1) @@ -687,9 +688,11 @@ else: parser.error("incorrect number of arguments") sys.exit(1) + write = sys.stdout.write if options.encoding: result = result.encode(options.encoding) - print(result) + write = sys.stdout.buffer.write + write(result) if __name__ == "__main__":
--- a/Lib/test/test_calendar.py Tue Aug 09 18:48:02 2011 -0500 +++ b/Lib/test/test_calendar.py Thu Aug 11 09:25:45 2011 +0800 @@ -2,6 +2,7 @@ import unittest from test import support +from test.script_helper import assert_python_ok import time import locale @@ -451,6 +452,11 @@ self.assertEqual(calendar.leapdays(1997,2020), 5) +class ConsoleOutputTestCase(unittest.TestCase): + def test_outputs_bytes(self): + (return_code, stdout, stderr) = assert_python_ok('-m', 'calendar', '--type=html', '2010') + self.assertEqual(stdout[:6], b'<?xml ') + def test_main(): support.run_unittest( OutputTestCase, @@ -460,6 +466,7 @@ TimegmTestCase, MonthRangeTestCase, LeapdaysTestCase, + ConsoleOutputTestCase )