From d544ec382311156d25253d52bf456d8927fb44ac Mon Sep 17 00:00:00 2001 From: Jakub Roztocil Date: Wed, 13 Jun 2012 15:25:05 +0200 Subject: [PATCH] Made --verbose work also with requests<0.12.1. --- httpie/httpmessage.py | 9 ++++++++- setup.py | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/httpie/httpmessage.py b/httpie/httpmessage.py index 0fb89103..7a3d87d2 100644 --- a/httpie/httpmessage.py +++ b/httpie/httpmessage.py @@ -18,6 +18,13 @@ def from_request(request): request_headers = dict(request.headers) if 'Host' not in request_headers: request_headers['Host'] = url.netloc + + try: + body = request.data + except AttributeError: + # requests < 0.12.1 + body = request._enc_data + return HTTPMessage( line='{method} {path} HTTP/1.1'.format( method=request.method, @@ -25,7 +32,7 @@ def from_request(request): headers='\n'.join(str('%s: %s') % (name, value) for name, value in request_headers.items()), - body=request.data, + body=body, content_type=request_headers.get('Content-Type') ) diff --git a/setup.py b/setup.py index ee04cfb5..ef95ebb6 100644 --- a/setup.py +++ b/setup.py @@ -9,6 +9,7 @@ if sys.argv[-1] == 'test': sys.exit() +# Debian has only requests==0.10.1 and httpie.deb depends on that. requirements = ['requests>=0.10.1', 'Pygments>=1.5'] if sys.version_info[:2] in ((2, 6), (3, 1)): # argparse has been added in Python 3.2 / 2.7