Merge pull request #1854 from Lukasa/220

Changelog for 2.2.0.

HISTORY.rst

@@ -3,9 +3,21 @@
 Release History
 ---------------
 
-2.x.y (yyyy-mm-dd)
+2.2.0 (2014-01-09)
 ++++++++++++++++++
 
+**API Changes**
+- New exception: ``ContentDecodingError``. Raised instead of ``urllib3``
+  ``DecodeError`` exceptions.
+
+**Bugfixes**
+- Avoid many many exceptions from the buggy implementation of ``proxy_bypass``
+  on OS X in Python 2.6.
+- Avoid crashing when attempting to get authentication credentions from
+  ~/.netrc when running as a user without a home directory.
+- Use the correct pool size for pools of connections to proxies.
+- Fix iteration of ``CookieJar`` objects.
+- Ensure that cookies are persisted over redirect.
 - Switch back to using chardet since charade has merged with it
 
 2.1.0 (2013-12-05)

requests/exceptions.py

@@ -7,6 +7,7 @@ requests.exceptions
 This module contains the set of Requests' exceptions.
 
 """
+from .packages.urllib3.exceptions import HTTPError as BaseHTTPError
 
 
 class RequestException(IOError):
@@ -63,5 +64,5 @@ class ChunkedEncodingError(RequestException):
     """The server declared chunked encoding but sent an invalid chunk."""
 
 
-class ContentDecodingError(RequestException):
+class ContentDecodingError(RequestException, BaseHTTPError):
     """Failed to decode response content"""