From: sprt <hellosprt@gmail.com>
Date: Thu, 24 Jan 2013 17:36:53 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/kennethreitz/requests
X-Git-Tag: v1.2.0~68^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ab2e7df8a9117a2839ec0f88eca57b564b1b02a2;p=services%2Fpython-requests.git

Merge branch 'master' of git://github.com/kennethreitz/requests

Conflicts:
	test_requests.py
---

ab2e7df8a9117a2839ec0f88eca57b564b1b02a2
diff --cc test_requests.py
index 9f2503d,32a9d01..c974e98
--- a/test_requests.py
+++ b/test_requests.py
@@@ -268,19 -261,11 +261,24 @@@ class RequestsTestCase(unittest.TestCas
          self.assertEqual(r.status_code, 200)
          self.assertTrue(b"text/py-content-type" in r.request.body)
  
 +    def test_prepared_request_hook(self):
 +        def hook(resp):
 +            resp.hook_working = True
 +            return resp
 +
 +        req = requests.Request('GET', HTTPBIN, hooks={'response': hook})
 +        prep = req.prepare()
 +
 +        s = requests.Session()
 +        resp = s.send(prep)
 +
 +        self.assertTrue(hasattr(resp, 'hook_working'))
 +
+     def test_links(self):
+         url = 'https://api.github.com/users/kennethreitz/repos?page=1&per_page=10'
+         r = requests.head(url=url)
+         self.assertEqual(r.links['next']['rel'], 'next')
+ 
  
  if __name__ == '__main__':
      unittest.main()