kennethreitz/requests3
1
0
Fork 0
mirror of https://github.com/kennethreitz/requests3.git synced 2026-06-05 23:10:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,431 Commits 1 Branch 1 Tag
5d6eeb5a7f78a88e8808b62da4c62791ec00ec16
Commit Graph

164 Commits

Author SHA1 Message Date
Nate Prewitt 37f1d23c39 Merge remote-tracking branch 'upstream/master' into proposed/3.0.0 2017-10-15 13:59:50 -07:00
Cory Benfield 4f49f6b3ed Correctly raise SSLError from urllib3. 2017-07-29 12:12:11 +01:00
Hugo Osvaldo Barrera 9766870807 Use comprehensions whenever possible 2017-07-14 11:42:32 -03:00
Hugo Osvaldo Barrera ed068ea0af Drop python2.6 support 2017-07-14 11:42:32 -03:00
Jeremy Cline f58d473d4e Move _pool_kwargs out to a function 
Signed-off-by: Jeremy Cline <jeremy@jcline.org>
 2017-06-26 09:35:14 -04:00
Jeremy Cline 14a0bf2912 Pass pool_kwargs rather than updating connection_pool_kw 
This addresses an issue where making HTTPS through proxies used the
default urllib3 connection pool settings.

fixes #3633

Signed-off-by: Jeremy Cline <jeremy@jcline.org>
 2017-06-24 18:58:48 -04:00
Cory Benfield c3f4a028bf Merge branch 'master' into proposed/3.0.0 2017-05-31 10:29:19 +01:00
kennethreitz c49ce5ae0b fix 2017-05-26 22:56:43 -04:00
kennethreitz 168109f13c fix adapters.py 2017-05-26 22:52:29 -04:00
Nate Prewitt a889b62c50 Merge branch 'master' into proposed/3.0.0 2017-05-21 16:25:55 -07:00
Jonas Laursen 00c6ad58b7 Simplify fix for #4025 2017-05-18 09:04:34 -07:00
Jonas Laursen af66521381 Fix #4025 2017-05-18 09:04:34 -07:00
Chris Gavin 19ba9f1097 Remove some unused imports. 2017-04-25 22:10:01 +01:00
Alexander 'Leo' Bergolth 4c13678587 remove change for timeout=None 2017-03-30 16:20:39 +02:00
Alexander 'Leo' Bergolth 1e7ae063ce whitespace 2017-03-29 18:20:11 +02:00
Alexander 'Leo' Bergolth fe58c6fdd6 small rearrangement 2017-03-29 18:01:18 +02:00
Alexander 'Leo' Bergolth a180db963f allow urllib3 Timeout objects as timeout parameter for HTTPAdapter.send() 
omit timeout argument when calling urlopen on the connection. this allows setting a default timeout at connection pool level:
adapter.poolmanager.connection_pool_kw['timeout'] = urllib3.Timeout(...)
 2017-03-29 16:53:28 +02:00
Bastien Gérard 4207867aaf PR review fixes: 
- used httpbin_secure for tests
- updated docstring related to `verify` param"
- used TLS acronym instead of SSL
 2017-03-22 21:28:38 +01:00
Bastien Gérard 42ec8b08f2 #3927 fixes based on review 2017-03-22 21:28:38 +01:00
Bastien Gérard 7d8b87c37f #3926 raise IOError when providing an invalid path to a CA bundle or certificate files 2017-03-22 21:28:38 +01:00
Nate Prewitt 84d99f01f5 add enforce_content_length=True default 2016-11-15 11:27:29 -07:00
Cory Benfield 7f88aca8f7 Merge branch 'master' into proposed/3.0.0 2016-11-15 17:16:04 +00:00
Pawel Miech c97a530638 [httpAdapter] allow empty password in proxy credentials 
fixes #3659
 2016-10-31 14:42:01 +01:00
Jeremy Cline 3d2b337906 HTTPAdapter now updates its PoolManager connection_pool_kw 
With the addition of https://github.com/shazow/urllib3/pull/830 requests
should update the connection_pool_kw on the PoolManager so that new
ConnectionPools get created when TLS/SSL settings change. This ensures
that users can update the CA certificates used to verify servers as well
as the client certificate and key it uses to authenticate with servers.

This fixes issue #2863
 2016-09-06 11:11:59 -04:00
Ian Cordasco b2f6173a38 Merge remote-tracking branch 'upstream/master' into proposed/3.0.0 
Conflicts:
   requests/__init__.py
   requests/sessions.py
   tests/test_requests.py
 2016-09-06 09:46:02 -05:00
Ville Skyttä 542fbbc67f Document bunch of return types 2016-08-09 13:32:56 +03:00
Casey Davidson ed07583f7e Change exception and variable names so that tests will run (currently one failing test). 2016-07-01 16:38:46 -07:00
Ian Cordasco ecfb85f85e Merge remote-tracking branch 'upstream/master' into proposed/3.0.0 
Conflicts:
      AUTHORS.rst
      requests/__init__.py
      requests/sessions.py
      tests/test_requests.py
 2016-06-03 08:42:01 -05:00
Seppo Yli-Olli 9e9d2c6521 Make BaseAdapter describe the mandatory adapter interface (#3216) 
* BaseAdapter definition of send is missing mandatory params

* Copy over relevant parts of the interface documentation

* Indentation fix

* Change base class documentation for close
 2016-05-24 13:23:16 -05:00
kennethreitz 39d6935488 Merge pull request #2953 from Lukasa/socks_proxy_support 
SOCKS Proxy Support
 2016-04-29 18:03:04 -04:00
Matt Dainty 2029a8a931 Clear any pooled proxy connections 
As well as clearing any pooled direct connections, iterate over any
ProxyManager objects and clear any pooled proxy connections there as well.
 2016-04-15 09:33:37 +01:00
Alexander Shchapov 6ca9d71bb5 Raise a ProxyError for proxy related connection issues. 2016-03-17 15:46:26 -04:00
kennethreitz c44fb99633 Merge commit '91eebb1' into v3.0.0 2016-02-01 23:47:05 -05:00
Carson Lam a02069ec9e Remove int type on max_retries argument. 2016-01-29 15:30:22 -08:00
Cory Benfield e4d15c4649 Help @sigmavirus24 with code golf. 2015-12-30 16:45:51 +00:00
Cory Benfield 11b9b24ac9 Some code cleanups. 2015-12-30 14:37:53 +00:00
Cory Benfield 1c54014daf Don't parse nonexistent URLs. 2015-12-30 10:48:29 +00:00
Cory Benfield 08364c6739 Add support for SOCKS 2015-12-30 10:40:24 +00:00
Olle Lundberg 68db4132e3 Update adapters.py 
Remove duplicate word.
 2015-11-25 02:02:41 +01:00
Ian Cordasco 35170e180e Merge pull request #2858 from Lukasa/support_ca_cert_directories 
Add support for a directory of CAs
 2015-11-07 15:39:41 -06:00
Cory Benfield e67cd15bc8 Fix breakage introduced by 8f591682 2015-11-05 18:54:40 +00:00
Cory Benfield 0352ec0bd3 Add support for a directory of CAs 2015-11-05 13:21:21 +00:00
Dimitris Bliablias 8f591682e6 Use buffering for HTTP responses on chunked requests 
For non-chunked requests, the request is performed using the 'urlopen'
method that underlying uses buffering for the HTTP responses (for Python
2.7+ versions). For chunked requests though, the request is made via a
different code path and so the 'getresponse' method is called without
using buffering. So, the response is consumed per single byte via a
recv() call on the underlying socket.

This patch, fixes that issue to mimic the non-chucked request behavior.
 2015-10-15 16:58:07 +03:00
Cory Benfield f7be4e5f28 NewConnectionErrors aren't timeouts. 
This is a compatibility change, and should be removed in 2.8.0
 2015-10-08 14:05:17 +01:00
Cory Benfield 8963e1567b Merge pull request #2678 from sigmavirus24/proposed/2.8.0 
Proposed 2.8.0
 2015-10-05 15:09:41 +01:00
Jason Grout 4c6540898c don't lowercase a url before urlparsing it 
urlparse automatically lowercases the scheme and hostname
 2015-08-28 20:20:07 +00:00
Jason Grout f3d4480a33 Use url parsing to check the scheme 2015-08-28 20:06:45 +00:00
Jason Grout c80121df91 Fix documentation for the proxies dictionary 2015-08-27 18:21:04 +00:00
Jason Grout 500f15da1f Factor out the proxy selection code 2015-08-27 18:21:04 +00:00
Jason Grout d7a3aa6188 Fix another place the proxy-selecting logic is used. 2015-08-27 17:26:14 +00:00