From: Scott Sadler Date: Sun, 26 Oct 2014 13:41:56 +0000 (+0100) Subject: Revert "fix failing test "test_prepare_unicode_url"" X-Git-Tag: v2.5.0~15^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8e69c9f0a16b37990df4430eb81a5138520689ac;p=services%2Fpython-requests.git Revert "fix failing test "test_prepare_unicode_url"" This reverts commit 26ed7c2e1dce4271f3a3b111a167a6dcca3acddf. --- diff --git a/requests/models.py b/requests/models.py index e216efa..17e5598 100644 --- a/requests/models.py +++ b/requests/models.py @@ -22,8 +22,8 @@ from .packages.urllib3.util import parse_url from .packages.urllib3.exceptions import ( DecodeError, ReadTimeoutError, ProtocolError) from .exceptions import ( - HTTPError, RequestException, MissingSchema, InvalidURL, - ChunkedEncodingError, ContentDecodingError, ConnectionError, + HTTPError, RequestException, MissingSchema, InvalidURL, + ChunkedEncodingError, ContentDecodingError, ConnectionError, StreamConsumedError) from .utils import ( guess_filename, get_auth_from_url, requote_uri, @@ -310,7 +310,7 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin): # such as OAuth to work on a fully prepared request. # This MUST go after prepare_auth. Authenticators could add a hook - self.prepare_hooks(hooks if hooks is not None else []) + self.prepare_hooks(hooks) def __repr__(self): return '' % (self.method)