From: Kenneth Reitz <me@kennethreitz.com>
Date: Wed, 9 Nov 2011 23:13:38 +0000 (-0800)
Subject: Merge branch 'develop' into feature/rewrite
X-Git-Tag: v0.8.0~76
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c48f0d990fe44d4fd2a3645d9a491882b375bc96;p=services%2Fpython-requests.git

Merge branch 'develop' into feature/rewrite

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

c48f0d990fe44d4fd2a3645d9a491882b375bc96
diff --cc requests/models.py
index e5357c6,f9fc002..5ec06a6
--- a/requests/models.py
+++ b/requests/models.py
@@@ -250,11 -238,10 +251,11 @@@ class Request(object)
                      method=method,
                      # data=self.data,
                      # params=self.params,
-                     auth=self.auth,
+                     auth=self._auth,
                      cookies=self.cookies,
                      redirect=True,
 -                    config=self.config
 +                    config=self.config,
 +                    _poolmanager=self._poolmanager
                  )
                  request.send()
                  r = request.response
diff --cc test_requests.py
index 4e7b5b3,d5c9eaa..7b10a79
--- a/test_requests.py
+++ b/test_requests.py
@@@ -539,15 -529,14 +539,24 @@@ class RequestsTestSuite(unittest.TestCa
          assert params3['b'] in r3.content
          assert params3['c'] in r3.content
  
 +    def test_cookies(self):
 +
 +        s = requests.session()
 +        r = s.get(httpbin('cookies', 'set', 'face', 'book'))
 +        print r.headers
 +        print r.history[0].cookies
 +        print r.content
 +        print r.url
 +
+     def test_invalid_content(self):
+ 
+         # WARNING: if you're using a terrible DNS provider (comcast),
+         # this will fail.
+         r = requests.get('http://somedomainthatclearlydoesntexistg.com', allow_redirects=False)
+ 
+         assert r.content == None
+ 
+ 
 +
  if __name__ == '__main__':
      unittest.main()