1fcda912db
Revert "Documentation update : connection keep alive"
...
This reverts commit 1b2602344f
2014-08-29 10:30:49 -04:00
d22b8d8e7e
3.4 classifier
2014-08-28 13:10:26 -04:00
d33ce49aaa
keep-alive
2014-08-28 13:05:30 -04:00
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
08d8876230
Remove timeline.json from docs.
2014-08-26 20:20:34 +01:00
596ca83f0c
Update verify check and doc-string
2014-08-26 14:20:19 -05:00
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
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
7f236fcc40
woops
2014-08-24 20:22:55 -07:00
39b3a436d3
assert connect timeout inheritance
2014-08-24 20:18:05 -07:00
8f9ce13e43
ConnectTimeout multiple inheritance
2014-08-24 19:56:57 -07:00
f0b9b60f62
revert change
2014-08-24 19:46:46 -07:00
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
024db279c4
clarify comment
2014-08-23 10:10:44 -07:00
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
1c20d01f10
Cleanup grammar from previous commit.
2014-08-22 11:50:37 +01:00
391e064b8f
Merge pull request #2173 from tychotatitscheff/master
...
Documentation update : connection keep alive
2014-08-22 11:47:35 +01:00
1b2602344f
Documentation update : connection keep alive
2014-08-22 10:39:05 +02:00
337b338187
Adding my name to authors
2014-08-21 11:25:29 -07:00
5aa1881959
Adding myself to authors.
2014-08-21 11:16:59 -07:00
8bb8a9a37c
Adding my name to authors.
2014-08-21 11:12:36 -07:00
c7e087cf56
Added space and sentence case
...
Added space and sentence case as requested by sigmavirus24.
https://github.com/kennethreitz/requests/pull/2168
2014-08-21 11:05:02 -07:00
kennethreitz
aa6650a2e7
Merge pull request #2168 from ContinuousFunction/master
...
Tracking Previous Requests
2014-08-21 13:43:23 -04:00
2fc6e8a894
Update on Tracking Previous Requests
...
Modified the comment in sessions.py and rewrote the test in
test_requests.py
2014-08-19 10:51:26 -07:00
53d3cece00
21m
2014-08-19 12:53:26 -04:00
df641e74ff
Tracking Previous Requests
...
Addresses the issue brought up here:
https://github.com/kennethreitz/requests/issues/1929
2014-08-17 19:13:26 -07:00
kennethreitz
35d083e166
Merge pull request #2153 from jschneier/master
...
handle urllib3 api changes; closes #2045
2014-08-01 21:33:55 -04:00
47d0517d66
handle urllib3 api changes; closes #2045
2014-07-29 23:29:21 -04:00
kennethreitz
3eb69be879
Merge pull request #2148 from romanlevin/handle-socket-error-in-iter_content
...
Handle socket errors in iter_content
2014-07-27 09:59:08 -04:00
cf01a743af
Replace setattr
2014-07-24 23:30:11 +02:00
9eab9f7415
Handle socket errors in iter_content
2014-07-24 23:00:50 +02:00
kennethreitz
fe693c4922
Merge pull request #2142 from sigmavirus24/urllib3-1.9
...
Upgrade urllib3 to 1.9.x
2014-07-22 16:21:05 -04:00
kennethreitz
9575d6a6ce
Merge pull request #2145 from TkTech/patch-1
...
Update faq.rst
2014-07-22 16:20:37 -04:00
35f7bcdaa2
Update faq.rst
...
Revised wording based on feedback from @sigmavirus24
2014-07-22 13:10:40 -04:00
57b861148e
Update faq.rst
...
Removed an unnecessary "to" in the "What are "hostname doesn't match" errors?" section.
2014-07-22 12:38:08 -04:00
eb2906a65c
Merge pull request #2140 from dpursehouse/linkify-usernames
...
Linkify Github usernames in authors list
2014-07-22 07:57:25 +01:00
170d6269eb
Fix test bug courtesy of @shazow
2014-07-21 15:00:14 -05:00
811ee4eb5d
Upgrade urllib3 to 1.9.x
2014-07-21 13:37:10 -05:00
e66466a331
Merge pull request #2141 from esparta/master
...
Docs: Using print() function instead print command on advanced & quickstart
2014-07-18 21:17:43 +01:00
698b93b86d
Docs: Using print() function instead print command on advanced & quickstart user docs
2014-07-18 11:44:57 -05:00
eef4e0836c
Add links to Twitter accounts
...
Change-Id: Ic88eb128384b3cc9108151c219cd759c7524a4f1
2014-07-18 22:46:19 +09:00
4c94282fdf
Merge pull request #2139 from dpursehouse/line-wrapping
...
More line wrapping
2014-07-18 10:59:48 +01:00
743f38209d
Linkify Github usernames in authors list
...
- Linkify github usernames
- Remove usernames that do not exist
Change-Id: Ib88b70a3010e915b3570ae5062c8cb416c9a6462
2014-07-18 17:00:00 +09:00
44e426e4ff
More line wrapping
...
Change-Id: I950c3da727fb97b58d96a872b0d2ed718cc60ba8
2014-07-18 16:35:54 +09:00
Kenneth Reitz
kennethreitz