0.7.1

Closes #140.

README.rst

@@ -1214,10 +1214,12 @@ Changelog
 *You can click a version name to see a diff with the previous one.*
 
 * `0.8.0-dev`_
-* `0.7.0`_ (2013-09-24)
+* `0.7.1`_ (2013-09-24)
     * Added ``--ignore-stdin``.
     * Added support for auth plugins.
+    * Improved ``--help`` output.
     * Improved ``Content-Disposition`` parsing for ``--download`` mode.
+    * Update to Requests 2.0.0
 * `0.6.0`_ (2013-06-03)
     * XML data is now formatted.
     * ``--session`` and ``--session-read-only`` now also accept paths to
@@ -1336,7 +1338,7 @@ Changelog
 .. _0.5.0: https://github.com/jkbr/httpie/compare/0.4.1...0.5.0
 .. _0.5.1: https://github.com/jkbr/httpie/compare/0.5.0...0.5.1
 .. _0.6.0: https://github.com/jkbr/httpie/compare/0.5.1...0.6.0
-.. _0.7.0: https://github.com/jkbr/httpie/compare/0.6.0...0.7.0
+.. _0.7.1: https://github.com/jkbr/httpie/compare/0.6.0...0.7.1
-.. _0.8.0-dev: https://github.com/jkbr/httpie/compare/0.7.0...master
+.. _0.8.0-dev: https://github.com/jkbr/httpie/compare/0.7.1...master
 .. _AUTHORS.rst: https://github.com/jkbr/httpie/blob/master/AUTHORS.rst
 .. _LICENSE: https://github.com/jkbr/httpie/blob/master/LICENSE

httpie/__init__.py

@@ -3,7 +3,7 @@ HTTPie - a CLI, cURL-like tool for humans.
 
 """
 __author__ = 'Jakub Roztocil'
-__version__ = '0.7.0'
+__version__ = '0.7.1'
 __licence__ = 'BSD'
 
 

httpie/client.py

@@ -3,7 +3,6 @@ import sys
 from pprint import pformat
 
 import requests
-import requests.auth
 
 from . import sessions
 from . import __version__
@@ -15,12 +14,6 @@ JSON = 'application/json; charset=utf-8'
 DEFAULT_UA = 'HTTPie/%s' % __version__
 
 
-class HTTPie(object):
-
-    def __init__(self, env, plugin_manager):
-        pass
-
-
 def get_response(args, config_dir):
     """Send the request and return a `request.Response`."""
 

httpie/models.py

@@ -88,16 +88,7 @@ class HTTPMessage(object):
     @property
     def content_type(self):
         """Return the message content type."""
-        ct = self._orig.headers.get(
+        return self._orig.headers.get('Content-Type', '')
-            b'Content-Type',
-            self._orig.headers.get(
-                'Content-Type',
-                ''
-            )
-        )
-        if isinstance(ct, bytes):
-            ct = ct.decode()
-        return ct
 
 
 class HTTPResponse(HTTPMessage):

setup.py

@@ -11,7 +11,7 @@ if sys.argv[-1] == 'test':
 
 
 requirements = [
-    'requests>=1.2.3',
+    'requests>=2.0.0',
     'Pygments>=1.5'
 ]
 try:

tests/tests.py

@@ -809,8 +809,6 @@ class RequestBodyFromFilePathTest(BaseTestCase):
 
     """
     def test_request_body_from_file_by_path(self):
-        # FIXME: *sometimes* fails on py33, the content-type is form.
-        # https://github.com/jkbr/httpie/issues/140
         r = http(
             '--verbose',
             'POST',
@@ -822,8 +820,6 @@ class RequestBodyFromFilePathTest(BaseTestCase):
         self.assertIn('"Content-Type": "text/plain"', r)
 
     def test_request_body_from_file_by_path_with_explicit_content_type(self):
-        # FIXME: *sometimes* fails on py33, the content-type is form.
-        # https://github.com/jkbr/httpie/issues/140
         r = http(
             'POST',
             httpbin('/post'),