From: Kenneth Reitz <me@kennethreitz.com>
Date: Mon, 24 Oct 2011 14:09:36 +0000 (-0400)
Subject: Merge branch 'develop' into feature/rewrite
X-Git-Tag: v0.8.0~84
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8b9f689ecce7b8968feee014021299360a8b16df;p=services%2Fpython-requests.git

Merge branch 'develop' into feature/rewrite

Conflicts:
	requests/__init__.py
	requests/models.py
---

8b9f689ecce7b8968feee014021299360a8b16df
diff --cc requests/models.py
index f86d804,fd74ed5..3505891
--- a/requests/models.py
+++ b/requests/models.py
@@@ -19,11 -20,14 +20,18 @@@ from .hooks import dispatch_hoo
  from .structures import CaseInsensitiveDict
  from .packages.poster.encode import multipart_encode
  from .packages.poster.streaminghttp import register_openers, get_handlers
- from .utils import (dict_from_cookiejar, get_unicode_from_response, stream_decode_response_unicode, decode_gzip, stream_decode_gzip)
  from .status_codes import codes
+ from .exceptions import Timeout, URLRequired, TooManyRedirects
+ from .monkeys import Request as _Request
+ from .monkeys import HTTPRedirectHandler
 +from .exceptions import Timeout, URLRequired, TooManyRedirects, RequestException, HTTPError
++from .exceptions import Timeout, URLRequired, TooManyRedirects
++from .monkeys import Request as _Request
++from .monkeys import HTTPRedirectHandler
+ from .utils import (
+     dict_from_cookiejar, get_unicode_from_response,
+     stream_decode_response_unicode, decode_gzip, stream_decode_gzip)
  
- from .auth import dispatch as auth_dispatch
  
  REDIRECT_STATI = (codes.moved, codes.found, codes.other, codes.temporary_moved)