From: Kenneth Reitz <me@kennethreitz.com>
Date: Thu, 10 Nov 2011 06:15:54 +0000 (-0800)
Subject: Merge branch 'develop' of https://github.com/jbrendel/requests into develop
X-Git-Tag: v0.8.0~40
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=220f687e6fd2a789fb07fc3671da587846e97b25;p=services%2Fpython-requests.git

Merge branch 'develop' of https://github.com/jbrendel/requests into develop

Conflicts:
	AUTHORS
	requests/__init__.py
---

220f687e6fd2a789fb07fc3671da587846e97b25
diff --cc AUTHORS
index 776e791,2ebcdfd..e3dd319
--- a/AUTHORS
+++ b/AUTHORS
@@@ -50,4 -50,4 +50,5 @@@ Patches and Suggestion
  - Dan Head
  - Bruno Renié
  - David Fischer
- - Joseph McCullough
++- Joseph McCullough
+ - Juergen Brendel
diff --cc requests/__init__.py
index 027ea3c,d496b98..e3a9d2a
--- a/requests/__init__.py
+++ b/requests/__init__.py
@@@ -24,10 -24,10 +24,10 @@@ __copyright__ = 'Copyright 2011 Kennet
  
  from . import utils
  from .models import Request, Response
- from .api import request, get, head, post, patch, put, delete
 -from .api import request, get, options, head, post, patch, put, delete
 -from .sessions import session
++from .api import request, get, head, post, patch, put, delete, options
 +from .sessions import session, Session
  from .status_codes import codes
  from .exceptions import (
 -    RequestException, AuthenticationError, Timeout, URLRequired,
 -    TooManyRedirects
 +    RequestException, Timeout, URLRequired,
 +    TooManyRedirects, HTTPError, ConnectionError
  )