Fixed a UnicodeError in Python 2.6.

This commit is contained in:
Jakub Roztočil 2012-03-02 02:36:21 +01:00
parent bb653bf1a9
commit 9634dca7d8

View File

@ -108,7 +108,7 @@ parser.add_argument('items', metavar='item', nargs='*',
def main(args=None, def main(args=None,
stdin=sys.stdin, stdin=sys.stdin,
stdin_isatty=sys.stdout.isatty(), stdin_isatty=sys.stdin.isatty(),
stdout=sys.stdout, stdout=sys.stdout,
stdout_isatty=sys.stdout.isatty()): stdout_isatty=sys.stdout.isatty()):
@ -166,7 +166,7 @@ def main(args=None,
encoding = response.encoding or 'ISO-8859-1' encoding = response.encoding or 'ISO-8859-1'
original = response.raw._original_response original = response.raw._original_response
status_line, headers, body = ( status_line, headers, body = (
u'HTTP/{version} {status} {reason}'.format( 'HTTP/{version} {status} {reason}'.format(
version='.'.join(str(original.version)), version='.'.join(str(original.version)),
status=original.status, reason=original.reason, status=original.status, reason=original.reason,
), ),
@ -185,10 +185,11 @@ def main(args=None,
if args.print_headers: if args.print_headers:
stdout.write(status_line) stdout.write(status_line)
stdout.write('\n') stdout.write('\n')
stdout.write(headers) stdout.write(headers.encode('utf-8'))
stdout.write('\n') stdout.write('\n')
if args.print_body: if args.print_body:
stdout.write(body) stdout.write(body.encode('utf-8'))
stdout.write('\n')
if __name__ == '__main__': if __name__ == '__main__':
main() main()