Commit Graph

122 Commits

Author SHA1 Message Date
kennethreitz f69d8c16ed updated urllib3 (v1.15.1) 2016-04-29 18:11:17 -04:00
kennethreitz 39d6935488 Merge pull request #2953 from Lukasa/socks_proxy_support
SOCKS Proxy Support
2016-04-29 18:03:04 -04:00
Rémy HUBSCHER 70a344d8eb Update readthedocs links. 2016-04-28 12:39:10 +02:00
Cory Benfield 396963ac7e Temporary urllib3 patch 2015-12-30 10:40:12 +00:00
Cory Benfield cd84b3ff94 Update to urllib3 1.14 2015-12-30 10:07:16 +00:00
Cory Benfield 834a9601c3 Update urllib3 to 1.13.1 2015-12-19 08:40:39 +00:00
Cory Benfield 3c0f0b9ab5 Update urllib3 to 1.13 2015-12-15 14:47:20 +00:00
Cory Benfield 09bd3232dd Update urllib3 to 1.12 2015-10-05 15:38:24 +01:00
Ian Cordasco d7026bfb2a Upgrade urllib3 to 7fcfcd08a6a2150f93144d111904d1e4fb65c909 2015-07-18 10:43:26 -05:00
Ian Cordasco 1e640c8456 Merge branch 'debian-imports' of https://github.com/untitaker/requests into proposed/2.8.0 2015-07-18 10:38:30 -05:00
Cory Benfield ee7389da98 Synchronize urllib3 to 1.10.4 2015-05-03 15:16:07 +01: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 73b9b6906d Update urllib3 to 7b82da0fa3a13514d11a863e379e7541d0ec46ef 2015-04-23 11:27:42 -05:00
Ian Cordasco 3e3fc7683c Remove VendorAlias meta_path hook 2015-04-22 16:26:14 -05:00
Cory Benfield 3d339ed7e6 Update urllib3 to 0b744993
(cherry picked from commit df63ee3e13672caa6b3256c6579fa85caefb2729)
2015-04-22 13:16:12 -05:00
Ian Cordasco 5fcd843eb2 Update urllib3 to 10b7a0fefa6596f47a9a6afc80f1f4d1ae950b66 2015-04-22 08:17:39 -05:00
Ian Cordasco 1b5bfe681b Place VendorAlias first in meta_path
When other libraries or tools add items to the meta_path, we need to preempt
some of their import hooks to be sure modules can be properly found. This also
prevents problems importing built-in modules on Python 2 where it will first
attempt to import something like:

    requests.packages.chardet.sys

By placing our VendorAlias first, the above will fail and then it will fall
back to trying to import sys directly instead.

Closes #2465
2015-04-05 20:48:36 -05:00
Ian Cordasco b2ce5be9d0 Revert "Minor Patch TypeError thrown" 2015-03-23 10:11:13 -05:00
Josh Brown 1b5317ea08 Minor Patch TypeError thrown 2015-03-23 16:01:48 +11:00
Ian Cordasco a0790f37b7 Update urllib3 to 43b5b2b452e4344374de7d08ececcca495079b8d 2015-03-10 19:34:34 -05:00
Ian Cordasco 2669f0c0b1 Fix when packages are unvendored
When working these changes back upstream to pip, we realized that the
previous fix wasn't ideal since unvendoring the packages broke the
imports. For example, if urllib3 were unvendored, then the following
would fail:

    from requests.packages import urllib3
2015-02-28 23:04:24 -06:00
Ian Cordasco 6ea3f2ada8 Only alias the imports for vendored dependencies
While discussion the issue, Donald Stufft (@dstufft) and I realized the
simplest solution is to simply add an alias per vendored dependency. The
resulting changes are simple and effective. It prevents the issue in
2.5.2 and 2.5.3 where the following would work:

    from requests.packages import webbrowser

This now appropriately raises an ImportError.

Closes #2465
2015-02-28 20:13:46 -06:00
Ian Cordasco 58e513579a Update urllib3 to 29aa09bde9c42cc9a8d79aac47ee3d362b438cca 2015-02-23 16:02:30 -06:00
Joe Smith 62df872871 Upgrade urllib3 to 490d3a227fadb626cd54a240b9d0922f849914b4 2015-02-11 11:04:25 -08:00
Ian Cordasco d2d576b6b1 Update urllib3 to a27758625e4169330fcf965652b1093faf5aaaa2 2015-01-09 20:55:54 -06:00
Ian Cordasco da82fb4b1d Give proper attribution to pip 2014-12-12 21:12:31 -06:00
Ian Cordasco d615405519 Copy pip's import machinery wholesale 2014-12-08 20:48:40 -06:00
Kenneth Reitz 7aa6c62d6d updatee chardet, urllib3 2014-12-01 14:40:32 -05: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
Ian Cordasco 811ee4eb5d Upgrade urllib3 to 1.9.x 2014-07-21 13:37:10 -05:00
Donald Stufft 626c48e947 Update urllib3 to 4fb351cd2 2014-05-12 14:43:50 -04:00
apr 36b0481f24 Update urllib to 1.8.2 2014-04-24 14:43:26 -04:00
Stan Hu 6c839985b9 Update urllib to 1.8 (8a8c601bee) 2014-03-28 16:37:54 -07:00
Donald Stufft d181577f3e Update urllib3 to 9346c5c 2014-01-22 14:20:34 -05:00
Kevin Burke e1562afb58 Update urllib3 to 232f496 2014-01-07 12:32:01 -08:00
Ian Cordasco 9379a14cb4 Fix all remaining references to charade 2013-12-18 08:43:18 -06:00
Ian Cordasco 0bfbacd8b1 Initial work towards replacing charade 2013-12-18 08:42:12 -06:00
kennethreitz 3e66f08db7 Merge pull request #1775 from sigmavirus24/add-readme-to-packages
Add README to requests/packages
2013-12-03 17:02:25 -08:00
Ian Cordasco 617bc8cc1c Add README to requests/packages
- Hopefully people will read this before making changes to vendored libraries
2013-12-03 09:17:37 -06:00
Donald Stufft b825bbd4a2 Update urllib3 to 929f1586 2013-11-26 21:41:15 -05:00
Thomas Weißschuh 3ef4115349 upate urllib3 to a0c986a24d 2013-11-04 18:53:41 +00:00
Kenneth Reitz 0228851f19 Revert "Merge pull request #1710 from jvantuyl/master"
This reverts commit a8300c0ae6, reversing
changes made to 2e196be143.
2013-10-30 15:32:19 -04:00
Jayson Vantuyl a9ec28a1b4 don't prepare URLs for oddball schemes 2013-10-30 10:04:43 -07:00
Kenneth Reitz df272b7740 update internal dependencies 2013-10-24 10:31:05 -04:00
Kenneth Reitz 2f39e0e2aa new urllib3 2013-09-24 13:59:38 -04:00
ms4py d06dabab59 Update urllib3 to 14b8945 2013-08-03 13:55:19 +02:00
Gavrie Philipson ea2b639d31 Update urllib3 to d89d508 2013-07-29 11:29:41 +03:00
Audrius Butkevicius 9f119ee420 Update urllib3 to a43319f 2013-07-18 21:06:19 +00:00
Cory Benfield ecf57cac5c Update urllib3 to cffbd6b317 2013-06-18 17:47:23 +01:00