From: Roberto Migli Date: Mon, 13 Jan 2014 13:04:28 +0000 (+0100) Subject: Merged changes from @lukasa X-Git-Tag: v2.2.1~6^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=49fb630eb4c8345702aaddc90d8edf73fd173a6e;p=services%2Fpython-requests.git Merged changes from @lukasa --- 49fb630eb4c8345702aaddc90d8edf73fd173a6e diff --cc test_requests.py index 2f4c40a,4c1a369..0a73310 --- a/test_requests.py +++ b/test_requests.py @@@ -702,9 -702,13 +702,13 @@@ class RequestsTestCase(unittest.TestCas assert ('user', 'pass pass') == requests.utils.get_auth_from_url(url) def test_get_auth_from_url_percent_chars(self): - url = 'http://user%user:pass@complex.url.com/path?query=yes' + url = 'http://user%25user:pass@complex.url.com/path?query=yes' assert ('user%user', 'pass') == requests.utils.get_auth_from_url(url) + def test_get_auth_from_url_encoded_hashes(self): + url = 'http://user:pass%23pass@complex.url.com/path?query=yes' + assert ('user', 'pass#pass') == requests.utils.get_auth_from_url(url) + def test_cannot_send_unprepared_requests(self): r = requests.Request(url=HTTPBIN) with pytest.raises(ValueError):