From 0ae9d7af58aaf3fca400a6aaa3329ce5e3f4bf26 Mon Sep 17 00:00:00 2001
From: Jakub Roztocil <jakub@roztocil.name>
Date: Thu, 3 Jan 2013 14:42:17 +0100
Subject: [PATCH] Compatibility with requests v1.0.4 (requests URL params).

---
 httpie/models.py | 19 +++----------------
 setup.py         |  2 +-
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/httpie/models.py b/httpie/models.py
index 14771628..94df1fb2 100644
--- a/httpie/models.py
+++ b/httpie/models.py
@@ -1,8 +1,8 @@
 import os
 import sys
-from .compat import urlsplit, is_windows, bytes, str
 
 from .config import DEFAULT_CONFIG_DIR, Config
+from .compat import urlsplit, is_windows, bytes, str
 
 
 class Environment(object):
@@ -144,29 +144,16 @@ class HTTPRequest(HTTPMessage):
     def headers(self):
         url = urlsplit(self._orig.url)
 
-        # Querystring
-        qs = ''
-        if url.query or self._orig.params:
-            qs = '?'
-            if url.query:
-                qs += url.query
-            # Requests doesn't make params part of ``request.url``.
-            if self._orig.params:
-                if url.query:
-                    qs += '&'
-                qs += type(self._orig)._encode_params(self._orig.params)
-
-        # Request-Line
         request_line = '{method} {path}{query} HTTP/1.1'.format(
             method=self._orig.method,
             path=url.path or '/',
-            query=qs
+            query='?' + url.query if url.query else ''
         )
 
         headers = dict(self._orig.headers)
 
         if 'Host' not in headers:
-            headers['Host'] = urlsplit(self._orig.url).netloc
+            headers['Host'] = url.netloc
 
         headers = ['%s: %s' % (name, value)
                    for name, value in headers.items()]
diff --git a/setup.py b/setup.py
index dcfd8e44..72f0b7ba 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ if sys.argv[-1] == 'test':
 
 
 requirements = [
-    'requests>=1.0.3',
+    'requests>=1.0.4',
     'Pygments>=1.5'
 ]
 if sys.version_info[:2] in ((2, 6), (3, 1)):