From: Ian Cordasco <graffatcolmingov@gmail.com>
Date: Wed, 17 Dec 2014 04:18:51 +0000 (-0600)
Subject: Merge branch 'master' of https://github.com/ContinuousFunction/requests into pr/2344
X-Git-Tag: v2.5.1~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=386c589ba0832eed62aef91a30adaed3d5648d1c;p=services%2Fpython-requests.git

Merge branch 'master' of https://github.com/ContinuousFunction/requests into pr/2344
---

386c589ba0832eed62aef91a30adaed3d5648d1c
diff --cc requests/models.py
index 17ff466,8a71e28..22b6d11
--- a/requests/models.py
+++ b/requests/models.py
@@@ -20,10 -20,11 +20,10 @@@ from .packages.urllib3.fields import Re
  from .packages.urllib3.filepost import encode_multipart_formdata
  from .packages.urllib3.util import parse_url
  from .packages.urllib3.exceptions import (
-     DecodeError, ReadTimeoutError, ProtocolError)
+     DecodeError, ReadTimeoutError, ProtocolError, LocationParseError)
  from .exceptions import (
 -    HTTPError, RequestException, MissingSchema, InvalidURL, 
 -    ChunkedEncodingError, ContentDecodingError, ConnectionError, 
 -    StreamConsumedError)
 +    HTTPError, MissingSchema, InvalidURL, ChunkedEncodingError,
 +    ContentDecodingError, ConnectionError, StreamConsumedError)
  from .utils import (
      guess_filename, get_auth_from_url, requote_uri,
      stream_decode_response_unicode, to_key_val_list, parse_header_links,