From 6f9ad9e4e10df653e5d8cd9f70626b809dec71eb Mon Sep 17 00:00:00 2001 From: Alen Mujezinovic Date: Tue, 28 Feb 2012 16:49:53 +0000 Subject: [PATCH] Revert "Not all web servers return UTF-8 and will crash httpie when decoding the response" This reverts commit 2f569b901dcd5852d16a88084af19883ee847f3e. --- httpie/httpie.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/httpie/httpie.py b/httpie/httpie.py index 55ef83c1..2588c8a1 100755 --- a/httpie/httpie.py +++ b/httpie/httpie.py @@ -163,22 +163,13 @@ def main(): # Display the response. original = response.raw._original_response - - try: - decode_from = [ - bit.split('=')[1] for bit in response.headers['content-type'].split(';') - if 'charset' in bit - ][0] - except IndexError: - decode_from = 'utf-8' - status_line, headers, body = ( u'HTTP/{version} {status} {reason}'.format( version='.'.join(str(original.version)), status=original.status, reason=original.reason, ), - str(original.msg).decode(decode_from), - response.content.decode(decode_from) if response.content else u'' + str(original.msg).decode('utf-8'), + response.content.decode('utf-8') if response.content else u'' ) if args.prettify and sys.stdout.isatty():