Commit Graph

1618 Commits

Author SHA1 Message Date
Kenneth Reitz 093709be4d Merge branch 'develop' of https://github.com/chadnickbok/requests into develop 2012-03-14 20:27:07 -04:00
Kenneth Reitz f6ed16bbbe Merge remote-tracking branch 'origin/develop' into develop 2012-03-14 20:27:02 -04:00
chadnickbok@gmail.com fc618aa78a Updated Requests api to accept a 'cert' argument.
This argument can be either a string, containing the path to a
pem-formatted key and certificate chain, or a tuple of (cert, key).

When supplied a tuple, the values are paths to an SSL certificate
chain file and key, respectively.
2012-03-14 17:15:29 -07:00
chadnickbok@gmail.com 82e69de44f Exposed key_file and cert_file in requests, to support https client certificates. 2012-03-14 15:57:30 -07:00
Idan Gazit cc4381b91e Merge branch 'develop' of github.com:kennethreitz/requests into develop 2012-03-13 17:05:24 -07:00
Idan Gazit eae641485b Remove unused import 2012-03-13 17:04:26 -07:00
Kenneth Reitz 29309201b6 remove cruft 2012-03-13 16:44:45 -07:00
Kenneth Reitz 0dd6c40205 dict sequence 2012-03-13 16:42:16 -07:00
Kenneth Reitz 84d9a1b577 dict_to_sequence 2012-03-13 16:39:51 -07:00
Idan Gazit 17170a2ca7 Merge branch 'develop', remote-tracking branch 'upstream/develop' into develop 2012-03-13 12:59:33 -07:00
Kenneth Reitz 8d34538f4c further lies. 2012-03-12 20:54:02 -07:00
Kenneth Reitz 8d1a85a8d0 Merge branch 'josh' into develop 2012-03-12 20:51:59 -07:00
Kenneth Reitz 06f048e507 lies. 2012-03-12 20:46:23 -07:00
Kenneth Reitz 6562137731 cookie history v0.10.8 2012-03-09 08:59:12 -08:00
Kenneth Reitz d078b69aef catch cookie errors that are prone to failure 2012-03-09 08:56:41 -08:00
Kenneth Reitz 0a1e527aec Merge of maxcountryman 2012-03-09 08:51:03 -08:00
Kenneth Reitz 9f55f503b1 merge conflict and fixes for python3 2012-03-09 08:43:12 -08:00
Kenneth Reitz 253cba373b _detected_encoding 2012-03-09 08:35:51 -08:00
Kenneth Reitz 9451ae2e98 iter_lines py3 compatibility
#470
2012-03-09 08:26:12 -08:00
Kenneth Reitz d203349740 Merge remote-tracking branch 'origin/develop' into develop 2012-03-09 08:07:17 -08:00
Kenneth Reitz 4aad69594d chunk_size iter_lines 2012-03-09 08:07:10 -08:00
Kenneth Reitz c7f165ae6f Merge branch 'iter_lines-fix' of https://github.com/fawek/requests into develop 2012-03-09 08:03:20 -08:00
Kenneth Reitz 98cbde1324 Chris Dary 2012-03-09 07:59:08 -08:00
Kenneth Reitz 77e5443f71 self.config.get('trust_env')
just for @mitsuhiko
2012-03-09 07:58:00 -08:00
Kenneth Reitz e15ae8f9a7 v0.10.8 2012-03-09 07:55:54 -08:00
Kenneth Reitz 0eb2509449 Merge pull request #475 from umbrae/generate-chunked-valueerror-fix
Generate chunked ValueError fix
2012-03-08 14:57:58 -08:00
Chris Dary bd0e002804 Move chunked head redirect test to ext 2012-03-08 14:44:07 -08:00
Chris Dary 0e65dff008 Remove unnecessary bit from previous branch.
This reverts commit e2645826be.
2012-03-08 13:22:38 -08:00
Chris Dary fba77fc65f Potential fix for #436 2012-03-08 13:10:18 -08:00
Chris Dary 1cf5ec872c Merge remote-tracking branch 'upstream/develop' into develop 2012-03-08 08:19:33 -08:00
Johannes Gorset 21c2146be4 Facilitate proxy configuration by environment variables 2012-03-08 13:34:23 +01:00
Kenneth Reitz 2f91d8e773 bunk 2012-03-07 16:54:53 -08:00
Kenneth Reitz 946f7ec579 percent encoded v0.10.7 2012-03-07 16:50:02 -08:00
Kenneth Reitz 658d609e9f default encode_uri to True 2012-03-07 16:46:15 -08:00
Kenneth Reitz abca7f0ad0 Merge remote-tracking branch 'origin/develop' into develop 2012-03-07 16:30:30 -08:00
Kenneth Reitz cf5ddecc4c encode_uri 2012-03-07 16:28:04 -08:00
Kenneth Reitz c1a44259d6 disablable encode_urls 2012-03-07 16:25:46 -08:00
Kenneth Reitz 54b2cb0b27 move config around a bit 2012-03-07 16:25:27 -08:00
Kenneth Reitz 09b6aef835 encode urls setting 2012-03-07 16:13:34 -08:00
Jakub Wieczorek 228c5e68ae Considerably simplify and fix the iter_lines() function
1. Do not use rstrip() as this would also throw away meaningful whitespaces
2. Avoid assuming what striplines() considers a line break terminator,
   the list of those is quite long in Unicode.
3. Add tests for the above edge cases.
2012-03-05 18:39:55 +01:00
Kenneth Reitz 6bb0529bed Merge pull request #466 from maxcountryman/develop
fixing a capitalization error in the send() method doc string
2012-03-01 14:21:45 -08:00
Max Countryman 1532effb68 fixing a capitalization error in the send() method doc string 2012-03-01 17:20:01 -05:00
Kenneth Reitz 65eaebb177 Merge remote-tracking branch 'origin/develop' into develop 2012-02-28 15:21:21 -05:00
Kenneth Reitz ab0714ce9c develop 2012-02-28 15:21:12 -05:00
Kenneth Reitz a3a7c504ad Merge pull request #464 from brendanmaguire/session_prefetch
Removed prefetch from args.
2012-02-28 12:19:25 -08:00
Brendan Maguire ca45da39fa Removed prefetch from args. 2012-02-28 20:16:01 +00:00
Kenneth Reitz 313ff95ee4 Merge pull request #463 from brendanmaguire/session_prefetch
Prefetch for sessions
2012-02-28 12:08:48 -08:00
Brendan Maguire 97815c9930 Prefetch for sessions 2012-02-28 20:02:21 +00:00
Chris Dary e2645826be Decode URL to utf-8 before joining.
To avoid UnicodeDecodeError's like on http://blip.fm/~1abvfu
2012-02-28 12:08:37 -05:00
Kenneth Reitz 7cc898f9ed master build test 2012-02-26 11:30:44 -05:00