summaryrefslogtreecommitdiff
path: root/test_requests.py
diff options
context:
space:
mode:
authorRoman Haritonov <reclosedev@gmail.com>2013-04-19 10:13:36 +0400
committerRoman Haritonov <reclosedev@gmail.com>2013-06-08 14:41:34 +0400
commit716b627c1e7c86af722affe973a11df4d5812a1b (patch)
treed85b51b19bc7df137db70a4e83a9af686059bbbf /test_requests.py
parent798a1ffdec682fe8b9e0c3386f445ab6e1fd801c (diff)
downloadpython-requests-716b627c1e7c86af722affe973a11df4d5812a1b.tar.gz
Don't reuse PreparedRequest on redirects
Diffstat (limited to 'test_requests.py')
-rwxr-xr-xtest_requests.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/test_requests.py b/test_requests.py
index fed70d8d..7ad10ee9 100755
--- a/test_requests.py
+++ b/test_requests.py
@@ -169,7 +169,6 @@ class RequestsTestCase(unittest.TestCase):
}
)
assert 'foo' not in s.cookies
-<<<<<<< HEAD
def test_request_cookie_overrides_session_cookie(self):
s = requests.session()