Merge branch 'auth_callables' of https://github.com/idangazit/requests into develop
authorKenneth Reitz <me@kennethreitz.com>
Sat, 26 Nov 2011 15:14:14 +0000 (10:14 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 26 Nov 2011 15:14:14 +0000 (10:14 -0500)
Conflicts:
requests/models.py

1  2 
docs/user/advanced.rst
docs/user/quickstart.rst
requests/models.py

Simple merge
Simple merge
@@@ -16,8 -17,7 +16,8 @@@ from datetime import datetim
  from .hooks import dispatch_hook
  from .structures import CaseInsensitiveDict
  from .status_codes import codes
 +from .packages import oreos
+ from .auth import HTTPBasicAuth
  from .packages.urllib3.exceptions import MaxRetryError
  from .packages.urllib3.exceptions import SSLError as _SSLError
  from .packages.urllib3.exceptions import HTTPError as _HTTPError