Commit Graph

5890 Commits

Author SHA1 Message Date
Jeremy Cline 66f5aebd35 Remove the dictionary comprehension from the tests
Signed-off-by: Jeremy Cline <jeremy@jcline.org>
2017-06-27 09:29:01 -04: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
Alex Gaynor c054a722bb Removed legacy fallback for python3.2 2017-06-25 12:51:15 -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
Jeremy Cline bacd043256 Tests to demonstrate issue #3633
Signed-off-by: Jeremy Cline <jeremy@jcline.org>
2017-06-24 18:58:20 -04:00
kennethreitz bbeb1c32d2 Merge branch 'master' of github.com:kennethreitz/requests 2017-06-16 18:31:19 -04:00
kennethreitz 1263b8660d stickers 2017-06-16 18:30:39 -04:00
Cory Benfield 2fde9ee407 Setup HISTORY for next release 2017-06-14 18:52:03 +01:00
Cory Benfield 51de61f914 v2.18.1 2017-06-14 18:50:53 +01:00
Cory Benfield dd13b13479 Prepare for next release cycle 2017-06-14 16:45:03 +01:00
Cory Benfield d93b37cee7 Prepare v2.18.0 2017-06-14 16:43:40 +01:00
kennethreitz a5b8f8d40a Merge branch 'master' of github.com:kennethreitz/requests 2017-06-11 18:10:11 -04:00
kennethreitz a8972a5bd2 attempt new ads 2017-06-11 18:10:05 -04:00
Cory Benfield bb4326c676 Merge pull request #4152 from felixonmars/patch-1
Fix a typo: paramters -> parameters
2017-06-11 18:34:36 +01:00
Felix Yan a0f0258eee Fix a typo: paramters -> parameters 2017-06-12 01:27:11 +08:00
Cory Benfield c5901ac893 Merge pull request #4151 from mayhewj/remove-exec
Remove exec permission from files that shouldn't have it
2017-06-11 10:26:51 +01:00
Justin Mayhew c6a6347156 Remove exec permission from files that shouldn't have it 2017-06-10 20:38:45 -03:00
Cory Benfield f3cdbcb86d Merge pull request #4120 from requests/update-3.0
Bring 3.0 up-to-date with master.
2017-06-10 07:57:23 +01:00
Cory Benfield 132040cc03 Merge pull request #4134 from mlcrazy/master
Raise exceptions in utils.set_environ
2017-06-09 19:34:56 +01:00
mlcrazy 613f61d77c Merge remote-tracking branch 'upstream/master' 2017-06-09 14:32:27 -04:00
mlcrazy edcc894a2e Adds to AUTHORS 2017-06-09 14:29:28 -04:00
mlcrazy 761e39b443 Adds changelog entry for #4134 2017-06-09 14:16:32 -04:00
mlcrazy 1d7fd6c8b3 Fixes error swallowing in set_environ 2017-06-09 14:10:47 -04:00
kennethreitz b3d138e0fd Merge pull request #4140 from Lukasa/issue/4138
Clearer makefile for building README.
2017-06-09 13:30:56 -04:00
kennethreitz 8a8b71f786 Merge branch 'master' into issue/4138 2017-06-09 13:27:02 -04:00
Cory Benfield 2872f17ab8 Merge pull request #4145 from gaojiuli/patch-1
typo
2017-06-09 10:04:40 +01:00
JiuLi Gao 22d12b0501 typo 2017-06-09 16:56:14 +08:00
Nate Prewitt 13eb907c48 Merge pull request #4144 from nateprewitt/move_compat_to_warn
Convert version compatibility checks to warnings
2017-06-08 19:40:07 -06:00
Nate Prewitt d8e2367809 convert version compatibility checks to warning 2017-06-08 15:21:25 -06:00
Cory Benfield f8ccc60498 Clearer makefile for building README 2017-06-07 13:50:00 +01:00
Cory Benfield 4f1b17c9c1 Merge pull request #4137 from edmorley/response-context-manager
Allow Requests.Response to be used as a context manager
2017-06-07 08:51:41 +01:00
Ed Morley 4847f5b8cd Allow Requests.Response to be used as a context manager
This saves having to wrap the call to requests with
`contextlib.closing()`, allowing it to be used directly in a
`with` statement, like so:

```
with requests.get('http://httpbin.org/get', stream=True) as r:
    # Do things with the response here.
```

Fixes #4136.
2017-06-06 23:30:47 +01:00
kennethreitz 40ce8144d1 Merge pull request #4135 from edmorley/gitignore-pytest-cache
Add the pytest .cache/ directory to .gitignore
2017-06-06 18:00:38 -04:00
Ed Morley 5a616ee980 Add the pytest .cache/ directory to .gitignore
For example, when a pytest run fails, it saves failure metadata to:
`.cache/v/cache/lastfailed`
2017-06-06 22:44:22 +01:00
Nate Prewitt b6ee4b2156 Merge pull request #4129 from felixonmars/fix-typo
Fix a typo: verison -> version
2017-06-05 22:07:28 -06:00
Felix Yan 0abb69b1cb Fix a typo: verison -> version 2017-06-06 12:01:41 +08:00
Cory Benfield 190a68550a This should be 3.0 2017-05-31 14:08:05 +01:00
Cory Benfield 548823be83 Clean up invalid indentation from merge 2017-05-31 10:41:47 +01:00
Cory Benfield a6f7f5dc62 Clean up flake8 errors from merge 2017-05-31 10:39:27 +01:00
Cory Benfield f308ea1a31 Clean up messy merge 2017-05-31 10:36:29 +01:00
Cory Benfield c3f4a028bf Merge branch 'master' into proposed/3.0.0 2017-05-31 10:29:19 +01:00
Cory Benfield 56971482af Merge pull request #4114 from cyberjacob/master
Catch error if multiprocessing is not available or is unable to determine the number of CPUs
2017-05-30 13:54:31 +01:00
Jacob Mansfield 98bbf8d170 Catch error if multiprocessing is not available or is unable to determine the number of CPUs 2017-05-30 13:47:55 +01:00
Cory Benfield d3a4d06238 Begin dev section of README 2017-05-30 11:49:05 +01:00
kennethreitz 152faa2a0f change development philosophy docs to reflect reality 2017-05-29 23:46:50 -04:00
kennethreitz e41c2c2d96 remove note about cacerts.pem 2017-05-29 23:43:53 -04:00
kennethreitz 3ca2722802 improve development instructions 2017-05-29 23:41:48 -04:00
kennethreitz 310d7f8a9b update development documentation 2017-05-29 23:40:44 -04:00
kennethreitz 01f982da50 remove "are you crazy?" section 2017-05-29 23:38:48 -04:00
kennethreitz ba509635a3 fix sidebars 2017-05-29 23:36:50 -04:00