summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into fix-pickling-adaptersfix-pickling-adaptersKenneth Reitz2014-01-0861-4505/+4662
|\ | | | | | | | | Conflicts: AUTHORS.rst
| * Merge pull request #1845 from Lukasa/proxy_bypassKenneth Reitz2014-01-081-1/+10
| |\ | | | | | | Resolve proxy_bypass problems.
| | * Don't let proxy_bypass bring you down.Cory Benfield2014-01-071-1/+10
| | |
| * | Merge pull request #1827 from pepijndevos/masterKenneth Reitz2014-01-081-1/+4
| |\ \ | | | | | | | | Use adapter pool size for proxies
| | * | use adapter pool size for proxiesPepijn de Vos2013-12-241-1/+4
| | |/
| * | Merge pull request #1831 from kevinburke/interlinksKenneth Reitz2014-01-082-36/+47
| |\ \ | | | | | | | | Add more interlinks between the documentation
| | * | Add more interlinks between the documentationKevin Burke2013-12-272-36/+47
| | |/ | | | | | | | | | | | | Also fixes up tense in a few cases, and adds the `intersphinx` extension so we can link to the urllib3 documentation when it is called out.
| * | Merge pull request #1832 from kevinburke/docs-warningsKenneth Reitz2014-01-085-6/+7
| |\ \ | | | | | | | | Fix warnings when building the docs
| | * | Fix warnings when building the docsKevin Burke2013-12-285-6/+7
| | |/ | | | | | | | | | | | | It may be nice to make builds fail if new documentation generates warnings, to avoid these sorts of problems slipping in in the future.
| * | Merge pull request #1836 from sigmavirus24/2014Kenneth Reitz2014-01-083-4/+4
| |\ \ | | | | | | | | Bump the year ftw
| | * | No one checks docs or a licenseIan Cordasco2014-01-022-2/+2
| | | |
| | * | Bump the year ftwIan Cordasco2014-01-021-2/+2
| | |/
| * | Merge pull request #1849 from kevinburke/urllib3-updateKenneth Reitz2014-01-073-3/+7
| |\ \ | | | | | | | | Update urllib3 to 232f496
| | * | Update urllib3 to 232f496Kevin Burke2014-01-073-3/+7
| |/ /
| * | /me grumblesKenneth Reitz2014-01-071-0/+1
| |/
| * Merge pull request #1823 from Lukasa/moredocsKenneth Reitz2013-12-202-5/+15
| |\ | | | | | | Update docs to highlight the value of r.encoding.
| | * Update docs to highlight the value of r.encoding.Cory Benfield2013-12-202-5/+15
| |/
| * Merge pull request #1807 from podshumok/fix-request-cookiejar-as-dictKenneth Reitz2013-12-193-10/+108
| |\ | | | | | | cookiejar.iteritems() is broken after 2.1.0 update
| | * split cookiejar as dict testKonstantin Podshumok2013-12-181-2/+64
| | |
| | * preserve python2-like dict API for RequestCookieJarKonstantin Podshumok2013-12-182-13/+7
| | |
| | * fix regression with cookiejar.iteritems()Konstantin Podshumok2013-12-183-11/+53
| | |
| * | Merge pull request #1816 from daftshady/masterKenneth Reitz2013-12-192-1/+8
| |\ \ | | | | | | | | Re-raise DecodeError
| | * | Re-raise DecodeErrordaftshady2013-12-192-1/+8
| |/ /
| * | Merge pull request #1808 from kennethreitz/fix-cookies-saved-on-redirectKenneth Reitz2013-12-181-0/+1
| |\ \ | | | | | | | | Fixes #1805
| | * | Fixes #1805fix-cookies-saved-on-redirectIan Cordasco2013-12-171-0/+1
| | |/ | | | | | | | | | | | | | | | Sure cookies are persisted to the session, but those new cookies are not added to the next prepared request. We need to update that new request's CookieJar with the new cookies.
| * | Merge pull request #1810 from kennethreitz/swap-charade-for-chardetKenneth Reitz2013-12-1846-4438/+4450
| |\ \ | | |/ | |/| Swap charade for chardet
| | * Update the history and change the last last references to charadeswap-charade-for-chardetIan Cordasco2013-12-183-2/+7
| | |
| | * Fix all remaining references to charadeIan Cordasco2013-12-183-3/+3
| | |
| | * Initial work towards replacing charadeIan Cordasco2013-12-1840-4433/+4440
| |/
| * Merge remote-tracking branch 'origin/master'Kenneth Reitz2013-12-164-22/+84
| |\
| * | 8,000,000Kenneth Reitz2013-12-161-1/+1
| | |
* | | Move comment to the right placeIan Cordasco2013-12-131-5/+2
| | |
* | | Updated AUTHORS.Erik Wickstrom2013-12-131-0/+1
| | |
* | | Fixed pickle support for requests.adapters.HTTPAdapter by addingErik Wickstrom2013-12-131-0/+5
| | | | | | | | | | | | 'proxy_manager' when unpickling.
* | | Prevent error when using proxies after picking an AdapterIan Cordasco2013-12-121-0/+3
| |/ |/|
* | Merge pull request #1792 from Lukasa/oopsCory Benfield2013-12-121-0/+1
|\ \ | | | | | | Fixup changelog with missing breaking change.
| * | Fixup changelog with missing breaking change.Cory Benfield2013-12-121-0/+1
|/ /
* | Merge pull request #1772 from mdbecker/make_morsel_to_cookie_more_pythonicKenneth Reitz2013-12-063-22/+83
|\ \ | |/ |/| Make morsel_to_cookie more pythonic
| * test_requests: convert tests to py.test styleMichael Becker2013-12-061-6/+9
| |
| * cookies: Fix bugs found during CIMichael Becker2013-12-062-3/+4
| |
| * cookies: Take a less cowardly approachMichael Becker2013-12-062-38/+73
| | | | | | | | | | | | | | Per discussion with @sigmavirus24, we'll take the less cowardly approach here. "the RFC defines the Expires header as a string with the format we're assigning to ``time_template`` so checking if it is a string is unnecessary." Crossing my fingers that this doesn't break anyones existing code...
| * AUTHORS: Take creditMichael Becker2013-12-061-0/+1
| |
| * cookies: Replace type checks with try/exceptMichael Becker2013-12-061-1/+3
| |
| * test_requests: Add tests for morsel_to_cookieMichael Becker2013-12-061-4/+23
|/ | | | These tests will ensure my changes to how we handle 'expires' don't cause any regressions.
* updated CA Bundle! v2.1.0Kenneth Reitz2013-12-052-31/+92
|
* Merge remote-tracking branch 'origin/master'Kenneth Reitz2013-12-057-37/+161
|\
| * Merge pull request #1770 from kmadac/masterKenneth Reitz2013-12-053-5/+106
| |\ | | | | | | Implemetation of IP address ranges for no_proxy environment variable
| | * function is_ipv4_network renamedKamil Madac2013-12-052-8/+16
| | | | | | | | | | | | more detailed check of cidr format
| | * Typo fixedKamil Madac2013-12-051-1/+1
| | |
| | * Broad exception fixedKamil Madac2013-12-051-2/+2
| | |
View Lorry Controller Status