3621 Commits

Author SHA1 Message Date
Kenneth Reitz dff383ce8f requests v2.4.1 v2.4.1 2014-09-09 12:34:34 -04:00
Cory Benfield 5e94c81e98 Merge pull request #2210 from sigmavirus24/bug/2207
Fix #2207
2014-09-09 15:24:24 +01:00
Cory Benfield 2416e2343a Merge pull request #2213 from kennethreitz/req-rsp
Request->Response.
2014-09-09 08:45:30 +01:00
Cory Benfield bf8f791a93 Request->Response. 2014-09-09 08:44:40 +01:00
Ian Cordasco 27c83f7177 Fix #2207
@Lukasa wrote the fix in #2207
2014-09-07 12:02:23 -05:00
kennethreitz 359659cf4b Merge pull request #2203 from Lukasa/remove_certifi
Remove hard certifi dependency and document.
2014-09-05 08:11:57 -07:00
Cory Benfield 9c6ae1dc0b Link to Mozilla trust store. 2014-09-04 19:44:37 +01:00
kennethreitz 0df32de02d Merge pull request #2199 from mtorromeo/patch-1
Open README and HISTORY as utf-8 encoded files (fixes #2196)
2014-09-04 11:41:46 -07:00
Cory Benfield a77054f90f Remove hard certifi dependency and document. 2014-09-04 19:40:15 +01:00
kennethreitz 1324ca1a0f Merge pull request #2193 from sigmavirus24/bug/2192
Capture and re-raise urllib3 ProtocolError
2014-09-04 11:39:41 -07:00
kennethreitz 209a871b63 Merge pull request #2191 from kevinburke/comma
add trailing comma
2014-09-04 11:39:23 -07:00
kennethreitz 07bbe214aa Merge pull request #2187 from kevinburke/more-docs
Document Timeout behaviour
2014-09-04 11:39:12 -07:00
Kenneth Reitz 958845ae35 requests[security] 2014-09-04 11:37:45 -07:00
kennethreitz bc2560480e Merge pull request #2195 from sigmavirus24/betterssl
Add betterssl extra
2014-09-04 11:36:56 -07:00
Ian Cordasco 9354855648 Consolidate error handling 2014-09-03 16:01:25 -05:00
Massimiliano Torromeo 226b5c7b0a Open README and HISTORY as utf-8 encoded files (fixes #2196) 2014-09-03 09:40:27 +02:00
Ian Cordasco ce7957c085 Add test for invalid port 2014-08-29 16:50:45 -05:00
Ian Cordasco c6a1167e8b Merge remote-tracking branch 'kevinburke/domain-failure-connection-error' into bug/2192 2014-08-29 16:43:51 -05:00
Ian Cordasco c809867035 Add betterssl extra 2014-08-29 16:39:22 -05:00
Kevin Burke 2c76122a48 Add test that invalid domain raises a ConnectionError 2014-08-29 14:07:28 -07:00
Ian Cordasco da122231e4 Capture and re-raise urllib3 ProtocolError 2014-08-29 15:16:30 -05:00
Kevin Burke 34ea836d77 tildes 2014-08-29 12:08:03 -07:00
Kevin Burke 59f5a1089a add trailing comma 2014-08-29 12:06:58 -07:00
Kevin Burke 81d6b3e435 s/behavior/behaviour 2014-08-29 11:51:09 -07:00
Kevin Burke dfa41afd43 Document Timeout behaviour 2014-08-29 11:50:11 -07:00
Kenneth Reitz 95161ed313 v2.4.0 changelog v2.4.0 2014-08-29 10:32:18 -04:00
Kenneth Reitz 1fcda912db Revert "Documentation update : connection keep alive"
This reverts commit 1b2602344f.

Conflicts:
	docs/user/advanced.rst
2014-08-29 10:30:49 -04:00
Kenneth Reitz d22b8d8e7e 3.4 classifier 2014-08-28 13:10:26 -04:00
Kenneth Reitz d33ce49aaa keep-alive 2014-08-28 13:05:30 -04:00
Kenneth Reitz 89cb408bb0 v2.4.0 2014-08-28 13:05:23 -04:00
kennethreitz 5f483369aa Merge pull request #2178 from sigmavirus24/env-retrieval
Add Session method to merge environment settings with per-request settings
2014-08-26 15:44:51 -04:00
kennethreitz 7e24176ca1 Merge pull request #2183 from Lukasa/docupdate
Fix #2180.
2014-08-26 15:41:44 -04:00
Cory Benfield 08d8876230 Remove timeline.json from docs. 2014-08-26 20:20:34 +01:00
Ian Cordasco 596ca83f0c Update verify check and doc-string 2014-08-26 14:20:19 -05:00
Ian Cordasco b4a7906bca Add Session method to merge environment settings with per-request settings 2014-08-26 14:20:19 -05:00
kennethreitz 7a09e727e3 Merge pull request #2174 from kevinburke/test-clarification
Clarify which tests to run in the Makefile
2014-08-26 15:15:28 -04:00
kennethreitz 32e403a908 Merge pull request #2176 from kevinburke/connect
Add support for connect timeouts
2014-08-26 15:13:30 -04:00
kennethreitz c879873b3e Merge pull request #2179 from kevinburke/urllib3-pypy-ssl
Updates urllib3 to 528ad3c
2014-08-26 15:10:51 -04:00
Kevin Burke 8bbc4fcb57 Updates urllib3 to 528ad3c
This includes fixes for openssl running with Pypy, so SSL connections can be
made if ndg-httpsclient, pyopenssl and pyasn1 are installed.

see also:

- https://github.com/shazow/urllib3/issues/449
- https://github.com/pypa/pip/issues/1988
2014-08-25 13:44:29 -07:00
Kevin Burke 7f236fcc40 woops 2014-08-24 20:22:55 -07:00
Kevin Burke 39b3a436d3 assert connect timeout inheritance 2014-08-24 20:18:05 -07:00
Kevin Burke 8f9ce13e43 ConnectTimeout multiple inheritance 2014-08-24 19:56:57 -07:00
Kevin Burke f0b9b60f62 revert change 2014-08-24 19:46:46 -07:00
Kevin Burke c2aeaa3959 Add support for connect timeouts
Modifies the timeout interface to also accept a tuple (connect, read) which
would be used to set individual connect and read timeouts for Requests. Adds
Advanced documentation explaining the interface and providing guidance for
timeout values.
2014-08-23 15:12:29 -07:00
Kevin Burke 024db279c4 clarify comment 2014-08-23 10:10:44 -07:00
Kevin Burke e70179a620 Clarify which tests to run in the Makefile
If you put your Virtualenv in the same folder as Requests (as I
usually do), py.test will pick up any test_* files inside the
virtualenv and attempt to run them too, leading to the following error:
https://gist.github.com/kevinburke/1aa2b07e01de3a7daa15

Instead specify the test file we would like to run in the Makefile.
2014-08-23 10:02:27 -07:00
kennethreitz c0322e490b Merge pull request #2172 from ContinuousFunction/master
Add to authors and fix case
2014-08-22 09:04:50 -04:00
Cory Benfield 1c20d01f10 Cleanup grammar from previous commit. 2014-08-22 11:50:37 +01:00
Cory Benfield 391e064b8f Merge pull request #2173 from tychotatitscheff/master
Documentation update : connection keep alive
2014-08-22 11:47:35 +01:00
tat3657 1b2602344f Documentation update : connection keep alive 2014-08-22 10:39:05 +02:00