Cory Benfield
2e62df456a
Avoid double releasing chunked upload connections
...
Resolves #2636
2015-06-13 08:10:53 +01:00
Cory Benfield
8b5e457b75
Merge branch 'colindickson-master'
2015-05-26 20:54:51 +01:00
colin
fd31453aa2
fix unittest typo
2015-05-26 20:53:31 +01:00
Ian Cordasco
a92a2a4263
Merge pull request #2615 from awiddersheim/docs/add_section_labels
...
Docs: Add more section labels for referencing
2015-05-26 09:12:33 -05:00
Andrew Widdersheim
7ba130a0cb
Docs: Add more section labels for referencing
...
Allows for sections to be linked from other projects using Intersphinx.
2015-05-26 09:16:24 -04:00
Cory Benfield
dfdf371a0f
Merge pull request #2610 from colindickson/master
...
fix contextlib.closing bug for sessions where content is not consumed…
2015-05-25 18:15:57 +01:00
colin
f608547bef
Merge remote-tracking branch 'origin/master'
...
Conflicts:
test_requests.py
2015-05-24 15:02:36 -04:00
colin
1da62a65d9
fix contextlib.closing bug for sessions where content is not consumed (issue #2593 )
2015-05-24 15:01:34 -04:00
colin
8d0889b91b
fix contextlib.closing bug for sessions where content is not consumed (issue #2593 )
2015-05-24 09:59:35 -04:00
Cory Benfield
3c850b3339
Merge pull request #2608 from radarhere/patch-1
...
Fixed typos
2015-05-21 09:16:24 +01:00
Andrew Murray
d249c0a9c6
Fixed typo in contributing.rst
2015-05-21 10:31:42 +10:00
Andrew Murray
d866d8a44d
Fixed typos in HISTORY.rst
2015-05-21 10:25:42 +10:00
Ian Cordasco
ab1f493c8b
Merge branch 'max-age-pr'
2015-05-15 10:13:42 -05:00
latyas(懒)
dd0f164f8e
Update cookies.py
2015-05-15 10:13:06 -05:00
Cory Benfield
059e105f8f
Use complexjson everywhere
2015-05-15 10:13:06 -05:00
Cory Benfield
395a3e8885
Partially revert ab84f9be57
2015-05-15 10:13:06 -05:00
latyas(懒)
d3bd3630ee
max-age may be not digits
2015-05-15 10:16:35 +08:00
Ian Cordasco
639f8347a3
Merge pull request #2598 from Lukasa/not-poor
...
Partially revert ab84f9be57
2015-05-14 17:32:19 -05:00
Cory Benfield
553907aa6b
Use complexjson everywhere
2015-05-14 22:30:24 +01:00
Cory Benfield
fb6dade63d
Partially revert ab84f9be57
2015-05-14 20:58:20 +01:00
latyas(懒)
cda95d3cde
morsel['max-age'] may be a str.
...
Example:
here are Set-Cookie list:
```python
sclst = ['dwac_bcIBMiaagZmkYaaadeYtg11eVR=j9jHdmPjUhgDOhyH9f89X4lQgehEmflVyeA%3D|dw-only|||CNY|false|Asia%2FShanghai|true; Path=/',
'sid=j9jHdmPjUhgDOhyH9f89X4lQgehEmflVyeA; Path=/',
'geoLocation=CN; Path=/',
'dwpersonalization_fae107a9dd0fc32ed99532ec1977f31f=bc8sEiaagZqRsaaadk8XoNTL8h20150506; Expires=Sun, 14-Jun-2015 10:37:07 GMT; Path=/',
'dwanonymous_fae107a9dd0fc32ed99532ec1977f31f=abjpA8kng31LjPp8ZEERDT4XVg; Version=1; Comment="Demandware anonymous cookie for site Sites-abercrombie_cn-Site"; Max-Age=15552000; Expires=Tue, 10-Nov-2015 10:37:07 GMT; Path=/',
'myStore=91156; Path=/',
'AF_PREF=en_CN; Path=/',
'dwsid=MiHJy3KYZKDcN0lZg4HS1zSpj1VV4s_tFu39ar0KXNpAx9aX8X2LlvZQ9m5fOOknb6QXtmmukHcOjmivYf31hg==; path=/; HttpOnly']
```
```python
for sc in sclst:
C = Cookie.SimpleCookie(sc)
for morsel in C.values():
cookie = requests.cookies.morsel_to_cookie(morsel)
cookiejar.set_cookie(cookie)
```
Then, exception occured
```shell
File "/Library/Python/2.7/site-packages/requests/cookies.py", line 402, in morsel_to_cookie
expires = time.time() + morsel['max-age']
TypeError: unsupported operand type(s) for +: 'float' and 'str'
```
As Cookie.SimpleCookie is in STL, should `morsel_to_cookie` check the type of `max-age`? On the other hand, if **max-age** can not be converted to float, it's illegal obviously.
2015-05-14 18:44:33 +08:00
Cory Benfield
c3c4c96a95
Merge pull request #2601 from sahutd/issue2599
...
Auth handler calls close instead of raw.close_conn
2015-05-14 07:15:10 +01:00
Saimadhav Heblikar
86aff09103
Auth handler calls close instead of raw.close_conn
2015-05-14 11:42:07 +05:30
Cory Benfield
4505f71829
Merge pull request #2597 from t-8ch/defensive_programming
...
do not blindly catch all AttributeErrors
2015-05-13 07:16:44 +01:00
Thomas Weißschuh
c6c8d649af
do not blindly catch all AttributeErrors
...
see shazow/urllib3#618
2015-05-12 23:21:03 +00:00
kennethreitz
868625532d
Merge remote-tracking branch 'origin/master'
2015-05-06 12:42:47 -07:00
kennethreitz
74609c5c8f
cleanup styles a bit
2015-05-06 12:42:43 -07:00
kennethreitz
ab84f9be57
removed poor code
2015-05-06 12:36:26 -07:00
kennethreitz
3475399a47
fix captilization
2015-05-06 12:35:14 -07:00
Ian Cordasco
a6937534ce
Merge pull request #2588 from gutworth/patch-1
...
use reST link syntax
2015-05-03 21:18:37 -05:00
Benjamin Peterson
ba7975fd16
use reST link syntax
2015-05-03 20:34:09 -04:00
Cory Benfield
b7bd297340
v2.7.0
v2.7.0
2015-05-03 15:47:20 +01:00
Cory Benfield
ee7389da98
Synchronize urllib3 to 1.10.4
2015-05-03 15:16:07 +01:00
Cory Benfield
6acca21bae
Merge pull request #2582 from mhavard999/master
...
Make docstring of api.get more clear
2015-05-01 06:59:46 +01:00
Matt Havard
6e9ebc06d1
Make docstring of api.get more clear
2015-04-30 23:54:34 -04:00
kennethreitz
ff71b25efc
release and version history
2015-04-25 17:50:03 -04:00
kennethreitz
c8004e3dd7
Merge remote-tracking branch 'origin/master'
2015-04-25 17:49:14 -04:00
kennethreitz
e859204554
new community
2015-04-25 17:49:12 -04:00
kennethreitz
5d722bd0f5
Merge pull request #2570 from sigmavirus24/release-process-docs
...
Add new release process to docs
2015-04-25 17:46:31 -04:00
kennethreitz
1f85ce8670
be cordial
2015-04-25 17:44:25 -04:00
kennethreitz
51938de6b7
improve contributing section
2015-04-25 17:42:48 -04:00
kennethreitz
535c51f548
style of contributing.rst
2015-04-25 17:36:14 -04:00
kennethreitz
09023f5894
Merge pull request #2572 from Lukasa/contribution
...
Add basic contributing guide
2015-04-25 17:34:45 -04:00
Cory Benfield
9dba203952
Add basic contributing guide
2015-04-25 21:39:00 +01:00
Ian Cordasco
f74fc486be
Update version number examples. Strip whitespace
...
Also I've included a bit more verbiage around why a major release
would happen and some reassurances that they will be rare.
2015-04-25 09:29:40 -05:00
Ian Cordasco
773e730d80
Add new release process to docs
...
Closes #2569
2015-04-24 19:28:23 -05:00
Markus Unterwaditzer
93216afbaf
Add information about the package stub
2015-04-24 15:29:19 +02:00
Markus Unterwaditzer
b7fc3a1250
Import aliases for Debian
...
Alternative to #2375
2015-04-24 12:05:19 +02:00
Ian Cordasco
ca66267d2c
Add release notes for 2.6.2
...
Closes #2561
v2.6.2
2015-04-23 11:29:10 -05:00
Ian Cordasco
73b9b6906d
Update urllib3 to 7b82da0fa3a13514d11a863e379e7541d0ec46ef
2015-04-23 11:27:42 -05:00