v2.19.0

* Updated HISTORY.rst.
* Moved version pin for idna to allow recent 2.7 release.
* Updated version warning for urllib3 to allow 1.23.
* Updated metadata dunders in __version__.py.
* Removed Python 2.6 trove classifier.
* Removed Python 2.6 reference from README.rst.

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -0,0 +1,34 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+Summary.
+
+## Expected Result
+
+What you expected.
+
+## Actual Result
+
+What happened instead.
+
+## Reproduction Steps
+
+```python
+import requests
+
+```
+
+## System Information
+
+    $ python -m requests.help
+
+```
+<paste here>
+```
+
+This command is only available on Requests v2.16.4 and greater. Otherwise,
+please provide some basic information about your system (Python version,
+operating system, &c).

.github/ISSUE_TEMPLATE/Custom.md

@@ -0,0 +1,7 @@
+---
+name: Request for Help
+about: Guidance on using Requests.
+
+---
+
+Please refer to our [StackOverflow tag](https://stackoverflow.com/questions/tagged/python-requests) for guidance.

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -0,0 +1,7 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+Requests is not accepting feature requests at this time.

.gitignore

@@ -23,7 +23,3 @@ t2.py
 dist
 
 /.mypy_cache/
-
-/.pytest_cache/
-
-/.tox/

.travis.yml

@@ -1,30 +1,29 @@
 sudo: false
 language: python
 python:
-  # - "3.4"
-  # - "3.5"
+  # - "2.6"
+  - "2.7"
+  - "3.4"
+  - "3.5"
   - "3.6"
-  # - "3.7-dev"
+  - "3.7-dev"
   # - "pypy"  -- appears to hang
   # - "pypy3"
-matrix:
-  allow_failures:
-    - python: 3.7-dev
 # command to install dependencies
 install: "make"
 # command to run tests
 script:
-  - make test-readme
+  - |
+    if [[ "$TRAVIS_PYTHON_VERSION" != "2.6" ]] ; then make test-readme; fi
   - make ci
 cache: pip
 jobs:
   include:
     - stage: test
       script:
-        - make test-readme
+        - |
+          if [[ "$TRAVIS_PYTHON_VERSION" != "2.6" ]] ; then make test-readme; fi
         - make ci
     - stage: coverage
       python: 3.6
       script: codecov
-
-

3.0-HISTORY.rst

@@ -1,81 +0,0 @@
-3.0.0 (2017-xx-xx)
-++++++++++++++++++
-
-- Support for Python 2.6 has been dropped.
-
-  - The ``OrderedDict`` import no longer exists in compat.py because it is part
-    of ``collections`` in Python 2.7 and newer.
-
-- Simplified logic for determining Content-Length and Transfer-Encoding.
-  Requests will now avoid setting both headers on the same request, and
-  raise an exception if this is done manually by a user.
-
-- Remove the HTTPProxyAuth class in favor of supporting proxy auth via
-  the proxies parameter.
-
-- Relax how Requests strips bodies from redirects. 3.0.0 only supports body
-  removal on 301/302 POST redirects and all 303 redirects.
-
-- Remove support for non-string/bytes parameters in ``_basic_auth_str``.
-
-- Prevent ``Session.merge_environment`` from erroneously setting the
-  ``verify`` parameter to ``None`` instead of ``True``.
-
-- Streaming responses with ``Response.iter_lines`` or ``Response.iter_content``
-  now requires an encoding to be set if one isn't provided by the server.
-
-- Exception raised during read timeout for ``Response.iter_content`` and
-  ``Response.iter_lines`` changed from ``ConnectionError`` to more
-  specific ``ReadTimeout``.
-
-- Raise exception if multiple locations are returned during a redirect.
-
-- Update ConnectionPool connections when TLS/SSL settings change.
-
-- Remove simplejson import and only use standard json module.
-
-- Strip surrounding whitespace from urls.
-
-- MissingSchema and InvalidSchema renamed to MissingScheme and InvalidScheme
-  respectively.
-
-- Change merge order for environment settings to avoid excluding Session-level
-  settings.
-
-- Encode redirect URIs as latin-1 before performing redirects in Python 3 to
-  avoid mangling during the requoting process.
-
-- Remove the ``__bool__`` and ``__nonzero__`` methods from a ``Response``
-  object.
-
-  This has been a planned feature for over a year. The behaviour is surprising
-  to most people and breaks most of the assumptions that people have about
-  Response objects. This resolves issue `#2002`_
-
-- Skip over empty chunks in iterators. Empty chunks could prematurely signal
-  the end of a request body's transmission, skipping them allows all of the
-  data through. See `#2631`_ for more details.
-
-- Rename the ``req`` argument from ``Session.resolve_redirects`` method
-  to ``request``.
-
-- Rename the ``resp`` argument from ``Session.resolve_redirects`` to
-  ``response``.
-
-- New ``PreparedRequest.send`` method. Now, you can
-  ``Request().prepare().send()``.
-
-- All porcelain API functions (e.g. ``requests.get``, etc) now accept an
-  optional ``session`` parameter. If provided, the session given will be used
-  for the request, in place of one being created for you.
-
-- URLs are now automatically stripped of leading/trailing whitespace.
-
-- ``Response.raise_for_status()`` now returns the response object for good responses
-
-- Use ``HTTPHeaderDict`` for response headers, allowing easier access to
-  individual values when multiple response headers are sent using the same
-  header name.
-
-.. _#2002: https://github.com/kennethreitz/requests/issues/2002
-.. _#2631: https://github.com/kennethreitz/requests/issues/2631

AUTHORS.rst

@@ -1,13 +1,17 @@
 Requests is written and maintained by Kenneth Reitz and
 various contributors:
 
-Keepers of the Four Crystals
-````````````````````````````
+Keepers of the Crystals
+```````````````````````
 
 - Kenneth Reitz <me@kennethreitz.org> `@kennethreitz <https://github.com/kennethreitz>`_, Keeper of the Master Crystal.
+- Ian Cordasco <graffatcolmingov@gmail.com> `@sigmavirus24 <https://github.com/sigmavirus24>`_.
+- Nate Prewitt <nate.prewitt@gmail.com> `@nateprewitt <https://github.com/nateprewitt>`_.
+
+Previous Keepers of Crystals
+````````````````````````````
+
 - Cory Benfield <cory@lukasa.co.uk> `@lukasa <https://github.com/lukasa>`_
-- Ian Cordasco <graffatcolmingov@gmail.com> `@sigmavirus24 <https://github.com/sigmavirus24>`_
-- Nate Prewitt <nate.prewitt@gmail.com> `@nateprewitt <https://github.com/nateprewitt>`_
 
 
 Patches and Suggestions
@@ -121,7 +125,7 @@ Patches and Suggestions
 - Bryce Boe <bbzbryce@gmail.com> (`@bboe <https://github.com/bboe>`_)
 - Colin Dunklau <colin.dunklau@gmail.com> (`@cdunklau <https://github.com/cdunklau>`_)
 - Bob Carroll <bob.carroll@alum.rit.edu> (`@rcarz <https://github.com/rcarz>`_)
-- Hugo Osvaldo Barrera <hugo@barrera.io> (`@hobarrera <https://github.com/hobarrera>`_)
+- Hugo Osvaldo Barrera <hugo@osvaldobarrera.com.ar> (`@hobarrera <https://github.com/hobarrera>`_)
 - Łukasz Langa <lukasz@langa.pl>
 - Dave Shawley <daveshawley@gmail.com>
 - James Clarke (`@jam <https://github.com/jam>`_)
@@ -153,19 +157,16 @@ Patches and Suggestions
 - Muhammad Yasoob Ullah Khalid <yasoob.khld@gmail.com> (`@yasoob <https://github.com/yasoob>`_)
 - Paul van der Linden (`@pvanderlinden <https://github.com/pvanderlinden>`_)
 - Colin Dickson (`@colindickson <https://github.com/colindickson>`_)
-- Sabari Kumar Murugesan (`@neosab <https://github.com/neosab>`_)
 - Smiley Barry (`@smiley <https://github.com/smiley>`_)
 - Shagun Sodhani (`@shagunsodhani <https://github.com/shagunsodhani>`_)
 - Robin Linderborg (`@vienno <https://github.com/vienno>`_)
 - Brian Samek (`@bsamek <https://github.com/bsamek>`_)
 - Dmitry Dygalo (`@Stranger6667 <https://github.com/Stranger6667>`_)
-- Tomáš Heger (`@geckon <https://github.com/geckon>`_)
 - piotrjurkiewicz
 - Jesse Shapiro <jesse@jesseshapiro.net> (`@haikuginger <https://github.com/haikuginger>`_)
 - Nate Prewitt <nate.prewitt@gmail.com> (`@nateprewitt <https://github.com/nateprewitt>`_)
 - Maik Himstedt
 - Michael Hunsinger
-- Jeremy Cline <jcline@redhat.com> (`@jeremycline <https://github.com/jeremycline>`_)
 - Brian Bamsch <bbamsch32@gmail.com> (`@bbamsch <https://github.com/bbamsch>`_)
 - Om Prakash Kumar <omprakash070@gmail.com> (`@iamprakashom <https://github.com/iamprakashom>`_)
 - Philipp Konrad <gardiac2002@gmail.com> (`@gardiac2002 <https://github.com/gardiac2002>`_)
@@ -179,11 +180,11 @@ Patches and Suggestions
 - Shmuel Amar (`@shmuelamar <https://github.com/shmuelamar>`_)
 - Gary Wu (`@garywu <https://github.com/garywu>`_)
 - Ryan Pineo (`@ryanpineo <https://github.com/ryanpineo>`_)
-<<<<<<< HEAD
 - Ed Morley (`@edmorley <https://github.com/edmorley>`_)
 - Matt Liu <liumatt@gmail.com> (`@mlcrazy <https://github.com/mlcrazy>`_)
 - Taylor Hoff <primdevs@protonmail.com> (`@PrimordialHelios <https://github.com/PrimordialHelios>`_)
-- Hugo van Kemenade (`@hugovk <https://github.com/hugovk>`_)
-=======
-- Allan Crooks (`@the-allanc <https://github.com/the-allanc>`_)
->>>>>>> 4f0b496d2b3c91d72a951bebdd6be9cec33c17d6
+- Arthur Vigil (`@ahvigil <https://github.com/ahvigil>`_)
+- Nehal J Wani (`@nehaljwani <https://github.com/nehaljwani>`_)
+- Demetrios Bairaktaris (`@DemetriosBairaktaris <https://github.com/demetriosbairaktaris>`_)
+- Darren Dormer (`@ddormer <https://github.com/ddormer>`_)
+- Rajiv Mayani (`@mayani <https://github.com/mayani>`_)

HISTORY.rst

@@ -6,15 +6,37 @@ Release History
 dev
 +++
 
+- [Short description of non-trivial change.]
+
+2.19.0 (2018-06-12)
+++++++++++++++++++
+
 **Improvements**
 
 - Warn user about possible slowdown when using cryptography version < 1.3.4
-- Use rfc3986 for URL parsing.
-- Use __slots__ for often–called classes.
+- Check for invalid host in proxy URL, before forwarding request to adapter.
+- Fragments are now properly maintained across redirects. (RFC7231 7.1.2)
+- Removed use of cgi module to expedite library load time.
+- Added support for SHA-256 and SHA-512 digest auth algorithms.
+- Minor performance improvement to ``Request.content``.
+- Migrate to using collections.abc for 3.7 compatibility.
 
 **Bugfixes**
 
-- Parsing empty ``Link`` headers with ``parse_header_links()`` no longer return one bogus entry
+- Parsing empty ``Link`` headers with ``parse_header_links()`` no longer return one bogus entry.
+- Fixed issue where loading the default certificate bundle from a zip archive
+  would raise an ``IOError``.
+- Fixed issue with unexpected ``ImportError`` on windows system which do not support ``winreg`` module.
+- DNS resolution in proxy bypass no longer includes the username and password in
+  the request. This also fixes the issue of DNS queries failing on macOS.
+- Properly normalize adapter prefixes for url comparison.
+- Passing ``None`` as a file pointer to the ``files`` param no longer raises an exception.
+- Calling ``copy`` on a ``RequestsCookieJar`` will now preserve the cookie policy correctly.
+
+**Dependencies**
+
+- We now support idna v2.7.
+- We now support urllib3 v1.23.
 
 2.18.4 (2017-08-15)
 +++++++++++++++++++
@@ -126,7 +148,7 @@ dev
 
 - Further restored the ``requests.packages`` namespace for compatibility reasons.
 
-No code modification (noted below) should be neccessary any longer.
+No code modification (noted below) should be necessary any longer.
 
 2.16.1 (2017-05-27)
 +++++++++++++++++++
@@ -236,11 +258,6 @@ Or, even better::
 - Updated bundled idna to v2.5.
 - Updated bundled certifi to 2017.4.17.
 
-- Altered how ``SessionRedirectMixin.resolve_redirects`` and ``Session.send``
-  process redirect history.  Developers who subclass ``resolve_redirects`` will
-  find a different ``.history`` attribute - the first element now contains the
-  original response, and the last element now contains the active response.
-
 2.13.0 (2017-01-24)
 +++++++++++++++++++
 

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2017 Kenneth Reitz
+Copyright 2018 Kenneth Reitz
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

Makefile

@@ -4,9 +4,7 @@ init:
 	pipenv install --dev --skip-lock
 test:
 	# This runs all of the tests, on both Python 2 and Python 3.
-	python setup.py test
-mypy:
-	python setup.py mypy
+	detox
 ci:
 	pipenv run py.test -n 8 --boxed --junitxml=report.xml
 

Pipfile

@@ -1,14 +1,12 @@
 [[source]]
-
-url = "https://pypi.python.org/simple"
+url = "https://pypi.org/simple/"
 verify_ssl = true
-
+name = "pypi"
 
 [dev-packages]
-
 pytest = ">=2.8.0"
 codecov = "*"
-pytest-httpbin = "*"
+pytest-httpbin = ">=0.0.7"
 pytest-mock = "*"
 pytest-cov = "*"
 pytest-xdist = "*"
@@ -20,13 +18,7 @@ docutils = "*"
 "flake8" = "*"
 tox = "*"
 detox = "*"
-httpbin = "==0.5.0"
-pytest-mypy = {git = "https://github.com/petr-muller/pytest-mypy", editable = true, ref = "flush-errors"}
-white = {version="*"}
-"e1839a8" = {path = ".", editable = true, extras=["socks"]}
-mypy = "*"
-"rfc3986" = "*"
-
+httpbin = ">=0.7.0"
 
 [packages]
-
+"e1839a8" = {path = ".", editable = true, extras = ["socks"]}

Pipfile.lock

@@ -0,0 +1,641 @@
+{
+    "_meta": {
+        "hash": {
+            "sha256": "0735b243455d8e924fbd05188ed435bfd3917f4acdade9b9e8f14741f3fc47e9"
+        },
+        "pipfile-spec": 6,
+        "requires": {},
+        "sources": [
+            {
+                "name": "pypi",
+                "url": "https://pypi.org/simple/",
+                "verify_ssl": true
+            }
+        ]
+    },
+    "default": {
+        "certifi": {
+            "hashes": [
+                "sha256:13e698f54293db9f89122b0581843a782ad0934a4fe0172d2a980ba77fc61bb7",
+                "sha256:9fa520c1bacfb634fa7af20a76bcbd3d5fb390481724c597da32c719a7dca4b0"
+            ],
+            "version": "==2018.4.16"
+        },
+        "chardet": {
+            "hashes": [
+                "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae",
+                "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"
+            ],
+            "version": "==3.0.4"
+        },
+        "e1839a8": {
+            "editable": true,
+            "extras": [
+                "socks"
+            ],
+            "path": "."
+        },
+        "idna": {
+            "hashes": [
+                "sha256:2c6a5de3089009e3da7c5dde64a141dbc8551d5b7f6cf4ed7c2568d0cc520a8f",
+                "sha256:8c7309c718f94b3a625cb648ace320157ad16ff131ae0af362c9f21b80ef6ec4"
+            ],
+            "version": "==2.6"
+        },
+        "pysocks": {
+            "hashes": [
+                "sha256:3fe52c55890a248676fd69dc9e3c4e811718b777834bcaab7a8125cf9deac672"
+            ],
+            "version": "==1.6.8"
+        },
+        "urllib3": {
+            "hashes": [
+                "sha256:06330f386d6e4b195fbfc736b297f58c5a892e4440e54d294d7004e3a9bbea1b",
+                "sha256:cc44da8e1145637334317feebd728bd869a35285b93cbb4cca2577da7e62db4f"
+            ],
+            "version": "==1.22"
+        }
+    },
+    "develop": {
+        "alabaster": {
+            "hashes": [
+                "sha256:2eef172f44e8d301d25aff8068fddd65f767a3f04b5f15b0f4922f113aa1c732",
+                "sha256:37cdcb9e9954ed60912ebc1ca12a9d12178c26637abdf124e3cde2341c257fe0"
+            ],
+            "index": "pypi",
+            "version": "==0.7.10"
+        },
+        "apipkg": {
+            "hashes": [
+                "sha256:2e38399dbe842891fe85392601aab8f40a8f4cc5a9053c326de35a1cc0297ac6",
+                "sha256:65d2aa68b28e7d31233bb2ba8eb31cda40e4671f8ac2d6b241e358c9652a74b9"
+            ],
+            "version": "==1.4"
+        },
+        "attrs": {
+            "hashes": [
+                "sha256:4b90b09eeeb9b88c35bc642cbac057e45a5fd85367b985bd2809c62b7b939265",
+                "sha256:e0d0eb91441a3b53dab4d9b743eafc1ac44476296a2053b6ca3af0b139faf87b"
+            ],
+            "version": "==18.1.0"
+        },
+        "babel": {
+            "hashes": [
+                "sha256:8ce4cb6fdd4393edd323227cba3a077bceb2a6ce5201c902c65e730046f41f14",
+                "sha256:ad209a68d7162c4cff4b29cdebe3dec4cef75492df501b0049a9433c96ce6f80"
+            ],
+            "version": "==2.5.3"
+        },
+        "bleach": {
+            "hashes": [
+                "sha256:b8fa79e91f96c2c2cd9fd1f9eda906efb1b88b483048978ba62fef680e962b34",
+                "sha256:eb7386f632349d10d9ce9d4a838b134d4731571851149f9cc2c05a9a837a9a44"
+            ],
+            "version": "==2.1.3"
+        },
+        "blinker": {
+            "hashes": [
+                "sha256:471aee25f3992bd325afa3772f1063dbdbbca947a041b8b89466dc00d606f8b6"
+            ],
+            "version": "==1.4"
+        },
+        "brotlipy": {
+            "hashes": [
+                "sha256:07194f4768eb62a4f4ea76b6d0df6ade185e24ebd85877c351daa0a069f1111a",
+                "sha256:091b299bf36dd6ef7a06570dbc98c0f80a504a56c5b797f31934d2ad01ae7d17",
+                "sha256:09ec3e125d16749b31c74f021aba809541b3564e5359f8c265cbae442810b41a",
+                "sha256:0be698678a114addcf87a4b9496c552c68a2c99bf93cf8e08f5738b392e82057",
+                "sha256:0fa6088a9a87645d43d7e21e32b4a6bf8f7c3939015a50158c10972aa7f425b7",
+                "sha256:1ea4e578241504b58f2456a6c69952c88866c794648bdc74baee74839da61d44",
+                "sha256:2699945a0a992c04fc7dc7fa2f1d0575a2c8b4b769f2874a08e8eae46bef36ae",
+                "sha256:2a80319ae13ea8dd60ecdc4f5ccf6da3ae64787765923256b62c598c5bba4121",
+                "sha256:2e5c64522364a9ebcdf47c5744a5ddeb3f934742d31e61ebfbbc095460b47162",
+                "sha256:36def0b859beaf21910157b4c33eb3b06d8ce459c942102f16988cca6ea164df",
+                "sha256:3a3e56ced8b15fbbd363380344f70f3b438e0fd1fcf27b7526b6172ea950e867",
+                "sha256:3c1d5e2cf945a46975bdb11a19257fa057b67591eb232f393d260e7246d9e571",
+                "sha256:50ca336374131cfad20612f26cc43c637ac0bfd2be3361495e99270883b52962",
+                "sha256:5de6f7d010b7558f72f4b061a07395c5c3fd57f0285c5af7f126a677b976a868",
+                "sha256:637847560d671657f993313ecc6c6c6666a936b7a925779fd044065c7bc035b9",
+                "sha256:653faef61241bf8bf99d73ca7ec4baa63401ba7b2a2aa88958394869379d67c7",
+                "sha256:786afc8c9bd67de8d31f46e408a3386331e126829114e4db034f91eacb05396d",
+                "sha256:79aaf217072840f3e9a3b641cccc51f7fc23037496bd71e26211856b93f4b4cb",
+                "sha256:7e31f7adcc5851ca06134705fcf3478210da45d35ad75ec181e1ce9ce345bb38",
+                "sha256:8b39abc3256c978f575df5cd7893153277216474f303e26f0e43ba3d3969ef96",
+                "sha256:9448227b0df082e574c45c983fa5cd4bda7bfb11ea6b59def0940c1647be0c3c",
+                "sha256:96bc59ff9b5b5552843dc67999486a220e07a0522dddd3935da05dc194fa485c",
+                "sha256:a07647886e24e2fb2d68ca8bf3ada398eb56fd8eac46c733d4d95c64d17f743b",
+                "sha256:af65d2699cb9f13b26ec3ba09e75e80d31ff422c03675fcb36ee4dabe588fdc2",
+                "sha256:b4c98b0d2c9c7020a524ca5bbff42027db1004c6571f8bc7b747f2b843128e7a",
+                "sha256:c6cc0036b1304dd0073eec416cb2f6b9e37ac8296afd9e481cac3b1f07f9db25",
+                "sha256:d2c1c724c4ac375feb2110f1af98ecdc0e5a8ea79d068efb5891f621a5b235cb",
+                "sha256:dc6c5ee0df9732a44d08edab32f8a616b769cc5a4155a12d2d010d248eb3fb07",
+                "sha256:fd1d1c64214af5d90014d82cee5d8141b13d44c92ada7a0c0ec0679c6f15a471"
+            ],
+            "version": "==0.7.0"
+        },
+        "certifi": {
+            "hashes": [
+                "sha256:13e698f54293db9f89122b0581843a782ad0934a4fe0172d2a980ba77fc61bb7",
+                "sha256:9fa520c1bacfb634fa7af20a76bcbd3d5fb390481724c597da32c719a7dca4b0"
+            ],
+            "version": "==2018.4.16"
+        },
+        "cffi": {
+            "hashes": [
+                "sha256:151b7eefd035c56b2b2e1eb9963c90c6302dc15fbd8c1c0a83a163ff2c7d7743",
+                "sha256:1553d1e99f035ace1c0544050622b7bc963374a00c467edafac50ad7bd276aef",
+                "sha256:1b0493c091a1898f1136e3f4f991a784437fac3673780ff9de3bcf46c80b6b50",
+                "sha256:2ba8a45822b7aee805ab49abfe7eec16b90587f7f26df20c71dd89e45a97076f",
+                "sha256:3c85641778460581c42924384f5e68076d724ceac0f267d66c757f7535069c93",
+                "sha256:3eb6434197633b7748cea30bf0ba9f66727cdce45117a712b29a443943733257",
+                "sha256:4c91af6e967c2015729d3e69c2e51d92f9898c330d6a851bf8f121236f3defd3",
+                "sha256:770f3782b31f50b68627e22f91cb182c48c47c02eb405fd689472aa7b7aa16dc",
+                "sha256:79f9b6f7c46ae1f8ded75f68cf8ad50e5729ed4d590c74840471fc2823457d04",
+                "sha256:7a33145e04d44ce95bcd71e522b478d282ad0eafaf34fe1ec5bbd73e662f22b6",
+                "sha256:857959354ae3a6fa3da6651b966d13b0a8bed6bbc87a0de7b38a549db1d2a359",
+                "sha256:87f37fe5130574ff76c17cab61e7d2538a16f843bb7bca8ebbc4b12de3078596",
+                "sha256:95d5251e4b5ca00061f9d9f3d6fe537247e145a8524ae9fd30a2f8fbce993b5b",
+                "sha256:9d1d3e63a4afdc29bd76ce6aa9d58c771cd1599fbba8cf5057e7860b203710dd",
+                "sha256:a36c5c154f9d42ec176e6e620cb0dd275744aa1d804786a71ac37dc3661a5e95",
+                "sha256:ae5e35a2c189d397b91034642cb0eab0e346f776ec2eb44a49a459e6615d6e2e",
+                "sha256:b0f7d4a3df8f06cf49f9f121bead236e328074de6449866515cea4907bbc63d6",
+                "sha256:b75110fb114fa366b29a027d0c9be3709579602ae111ff61674d28c93606acca",
+                "sha256:ba5e697569f84b13640c9e193170e89c13c6244c24400fc57e88724ef610cd31",
+                "sha256:be2a9b390f77fd7676d80bc3cdc4f8edb940d8c198ed2d8c0be1319018c778e1",
+                "sha256:d5d8555d9bfc3f02385c1c37e9f998e2011f0db4f90e250e5bc0c0a85a813085",
+                "sha256:e55e22ac0a30023426564b1059b035973ec82186ddddbac867078435801c7801",
+                "sha256:e90f17980e6ab0f3c2f3730e56d1fe9bcba1891eeea58966e89d352492cc74f4",
+                "sha256:ecbb7b01409e9b782df5ded849c178a0aa7c906cf8c5a67368047daab282b184",
+                "sha256:ed01918d545a38998bfa5902c7c00e0fee90e957ce036a4000a88e3fe2264917",
+                "sha256:edabd457cd23a02965166026fd9bfd196f4324fe6032e866d0f3bd0301cd486f",
+                "sha256:fdf1c1dc5bafc32bc5d08b054f94d659422b05aba244d6be4ddc1c72d9aa70fb"
+            ],
+            "version": "==1.11.5"
+        },
+        "chardet": {
+            "hashes": [
+                "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae",
+                "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"
+            ],
+            "version": "==3.0.4"
+        },
+        "click": {
+            "hashes": [
+                "sha256:29f99fc6125fbc931b758dc053b3114e55c77a6e4c6c3a2674a2dc986016381d",
+                "sha256:f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b"
+            ],
+            "version": "==6.7"
+        },
+        "cmarkgfm": {
+            "hashes": [
+                "sha256:0186dccca79483e3405217993b83b914ba4559fe9a8396efc4eea56561b74061",
+                "sha256:1a625afc6f62da428df96ec325dc30866cc5781520cbd904ff4ec44cf018171c",
+                "sha256:275905bb371a99285c74931700db3f0c078e7603bed383e8cf1a09f3ee05a3de",
+                "sha256:50098f1c4950722521f0671e54139e0edc1837d63c990cf0f3d2c49607bb51a2",
+                "sha256:50ed116d0b60a07df0dc7b180c28569064b9d37d1578d4c9021cff04d725cb63",
+                "sha256:61a72def110eed903cd1848245897bcb80d295cd9d13944d4f9f30cba5b76655",
+                "sha256:64186fb75d973a06df0e6ea12879533b71f6e7ba1ab01ffee7fc3e7534758889",
+                "sha256:665303d34d7f14f10d7b0651082f25ebf7107f29ef3d699490cac16cdc0fc8ce",
+                "sha256:70b18f843aec58e4e64aadce48a897fe7c50426718b7753aaee399e72df64190",
+                "sha256:761ee7b04d1caee2931344ac6bfebf37102ffb203b136b676b0a71a3f0ea3c87",
+                "sha256:811527e9b7280b136734ed6cb6845e5fbccaeaa132ddf45f0246cbe544016957",
+                "sha256:987b0e157f70c72a84f3c2f9ef2d7ab0f26c08f2bf326c12c087ff9eebcb3ff5",
+                "sha256:9fc6a2183d0a9b0974ec7cdcdad42bd78a3be674cc3e65f87dd694419b3b0ab7",
+                "sha256:c573ea89dd95d41b6d8cf36799c34b6d5b1eac4aed0212dee0f0a11fb7b01e8f",
+                "sha256:c5f1b9e8592d2c448c44e6bc0d91224b16ea5f8293908b1561de1f6d2d0658b1",
+                "sha256:cbe581456357d8f0674d6a590b1aaf46c11d01dd0a23af147a51a798c3818034",
+                "sha256:cf219bec69e601fe27e3974b7307d2f06082ab385d42752738ad2eb630a47d65",
+                "sha256:d08bad67fa18f7e8ff738c090628ee0cbf0505d74a991c848d6d04abfe67b697",
+                "sha256:d6f716d7b1182bf35862b5065112f933f43dd1aa4f8097c9bcfb246f71528a34",
+                "sha256:e08e479102627641c7cb4ece421c6ed4124820b1758765db32201136762282d9",
+                "sha256:e20ac21418af0298437d29599f7851915497ce9f2866bc8e86b084d8911ee061",
+                "sha256:e25f53c37e319241b9a412382140dffac98ca756ba8f360ac7ab5e30cad9670a",
+                "sha256:f20900f16377f2109783ae9348d34bc80530808439591c3d3df73d5c7ef1a00c"
+            ],
+            "version": "==0.4.2"
+        },
+        "codecov": {
+            "hashes": [
+                "sha256:8ed8b7c6791010d359baed66f84f061bba5bd41174bf324c31311e8737602788",
+                "sha256:ae00d68e18d8a20e9c3288ba3875ae03db3a8e892115bf9b83ef20507732bed4"
+            ],
+            "index": "pypi",
+            "version": "==2.0.15"
+        },
+        "configparser": {
+            "hashes": [
+                "sha256:5308b47021bc2340965c371f0f058cc6971a04502638d4244225c49d80db273a"
+            ],
+            "markers": "python_version < '3.2'",
+            "version": "==3.5.0"
+        },
+        "contextlib2": {
+            "hashes": [
+                "sha256:509f9419ee91cdd00ba34443217d5ca51f5a364a404e1dce9e8979cea969ca48",
+                "sha256:f5260a6e679d2ff42ec91ec5252f4eeffdcf21053db9113bd0a8e4d953769c00"
+            ],
+            "markers": "python_version < '3.2'",
+            "version": "==0.5.5"
+        },
+        "coverage": {
+            "hashes": [
+                "sha256:03481e81d558d30d230bc12999e3edffe392d244349a90f4ef9b88425fac74ba",
+                "sha256:0b136648de27201056c1869a6c0d4e23f464750fd9a9ba9750b8336a244429ed",
+                "sha256:104ab3934abaf5be871a583541e8829d6c19ce7bde2923b2751e0d3ca44db60a",
+                "sha256:15b111b6a0f46ee1a485414a52a7ad1d703bdf984e9ed3c288a4414d3871dcbd",
+                "sha256:198626739a79b09fa0a2f06e083ffd12eb55449b5f8bfdbeed1df4910b2ca640",
+                "sha256:1c383d2ef13ade2acc636556fd544dba6e14fa30755f26812f54300e401f98f2",
+                "sha256:28b2191e7283f4f3568962e373b47ef7f0392993bb6660d079c62bd50fe9d162",
+                "sha256:2eb564bbf7816a9d68dd3369a510be3327f1c618d2357fa6b1216994c2e3d508",
+                "sha256:337ded681dd2ef9ca04ef5d93cfc87e52e09db2594c296b4a0a3662cb1b41249",
+                "sha256:3a2184c6d797a125dca8367878d3b9a178b6fdd05fdc2d35d758c3006a1cd694",
+                "sha256:3c79a6f7b95751cdebcd9037e4d06f8d5a9b60e4ed0cd231342aa8ad7124882a",
+                "sha256:3d72c20bd105022d29b14a7d628462ebdc61de2f303322c0212a054352f3b287",
+                "sha256:3eb42bf89a6be7deb64116dd1cc4b08171734d721e7a7e57ad64cc4ef29ed2f1",
+                "sha256:4635a184d0bbe537aa185a34193898eee409332a8ccb27eea36f262566585000",
+                "sha256:56e448f051a201c5ebbaa86a5efd0ca90d327204d8b059ab25ad0f35fbfd79f1",
+                "sha256:5a13ea7911ff5e1796b6d5e4fbbf6952381a611209b736d48e675c2756f3f74e",
+                "sha256:69bf008a06b76619d3c3f3b1983f5145c75a305a0fea513aca094cae5c40a8f5",
+                "sha256:6bc583dc18d5979dc0f6cec26a8603129de0304d5ae1f17e57a12834e7235062",
+                "sha256:701cd6093d63e6b8ad7009d8a92425428bc4d6e7ab8d75efbb665c806c1d79ba",
+                "sha256:7608a3dd5d73cb06c531b8925e0ef8d3de31fed2544a7de6c63960a1e73ea4bc",
+                "sha256:76ecd006d1d8f739430ec50cc872889af1f9c1b6b8f48e29941814b09b0fd3cc",
+                "sha256:7aa36d2b844a3e4a4b356708d79fd2c260281a7390d678a10b91ca595ddc9e99",
+                "sha256:7d3f553904b0c5c016d1dad058a7554c7ac4c91a789fca496e7d8347ad040653",
+                "sha256:7e1fe19bd6dce69d9fd159d8e4a80a8f52101380d5d3a4d374b6d3eae0e5de9c",
+                "sha256:8c3cb8c35ec4d9506979b4cf90ee9918bc2e49f84189d9bf5c36c0c1119c6558",
+                "sha256:9d6dd10d49e01571bf6e147d3b505141ffc093a06756c60b053a859cb2128b1f",
+                "sha256:9e112fcbe0148a6fa4f0a02e8d58e94470fc6cb82a5481618fea901699bf34c4",
+                "sha256:ac4fef68da01116a5c117eba4dd46f2e06847a497de5ed1d64bb99a5fda1ef91",
+                "sha256:b8815995e050764c8610dbc82641807d196927c3dbed207f0a079833ffcf588d",
+                "sha256:be6cfcd8053d13f5f5eeb284aa8a814220c3da1b0078fa859011c7fffd86dab9",
+                "sha256:c1bb572fab8208c400adaf06a8133ac0712179a334c09224fb11393e920abcdd",
+                "sha256:de4418dadaa1c01d497e539210cb6baa015965526ff5afc078c57ca69160108d",
+                "sha256:e05cb4d9aad6233d67e0541caa7e511fa4047ed7750ec2510d466e806e0255d6",
+                "sha256:e4d96c07229f58cb686120f168276e434660e4358cc9cf3b0464210b04913e77",
+                "sha256:f3f501f345f24383c0000395b26b726e46758b71393267aeae0bd36f8b3ade80",
+                "sha256:f8a923a85cb099422ad5a2e345fe877bbc89a8a8b23235824a93488150e45f6e"
+            ],
+            "version": "==4.5.1"
+        },
+        "decorator": {
+            "hashes": [
+                "sha256:2c51dff8ef3c447388fe5e4453d24a2bf128d3a4c32af3fabef1f01c6851ab82",
+                "sha256:c39efa13fbdeb4506c476c9b3babf6a718da943dab7811c206005a4a956c080c"
+            ],
+            "version": "==4.3.0"
+        },
+        "detox": {
+            "hashes": [
+                "sha256:cb24895a0e4f95c0bcb1087a201c453600e075568af00848e91518fb2b984568",
+                "sha256:f3119bca4444f1e8a1d7189b064c52cfdd9a89ad3a1c921d78b49bf7f5dc5b1b"
+            ],
+            "index": "pypi",
+            "version": "==0.12"
+        },
+        "docutils": {
+            "hashes": [
+                "sha256:02aec4bd92ab067f6ff27a38a38a41173bf01bed8f89157768c1573f53e474a6",
+                "sha256:51e64ef2ebfb29cae1faa133b3710143496eca21c530f3f71424d77687764274",
+                "sha256:7a4bd47eaf6596e1295ecb11361139febe29b084a87bf005bf899f9a42edc3c6"
+            ],
+            "index": "pypi",
+            "version": "==0.14"
+        },
+        "enum34": {
+            "hashes": [
+                "sha256:2d81cbbe0e73112bdfe6ef8576f2238f2ba27dd0d55752a776c41d38b7da2850",
+                "sha256:644837f692e5f550741432dd3f223bbb9852018674981b1664e5dc339387588a",
+                "sha256:6bd0f6ad48ec2aa117d3d141940d484deccda84d4fcd884f5c3d93c23ecd8c79",
+                "sha256:8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1"
+            ],
+            "markers": "python_version < '3.4'",
+            "version": "==1.1.6"
+        },
+        "eventlet": {
+            "hashes": [
+                "sha256:06cffa55b335cc4fc32d0079242a81e8a9cddf2581d64d5f0543e2d412b26ca8",
+                "sha256:554a50dad7abee0a9775b0780ce9d9c0bd9123dda4743c46d4314170267c6c47"
+            ],
+            "version": "==0.23.0"
+        },
+        "execnet": {
+            "hashes": [
+                "sha256:a7a84d5fa07a089186a329528f127c9d73b9de57f1a1131b82bb5320ee651f6a",
+                "sha256:fc155a6b553c66c838d1a22dba1dc9f5f505c43285a878c6f74a79c024750b83"
+            ],
+            "version": "==1.5.0"
+        },
+        "flake8": {
+            "hashes": [
+                "sha256:7253265f7abd8b313e3892944044a365e3f4ac3fcdcfb4298f55ee9ddf188ba0",
+                "sha256:c7841163e2b576d435799169b78703ad6ac1bbb0f199994fc05f700b2a90ea37"
+            ],
+            "index": "pypi",
+            "version": "==3.5.0"
+        },
+        "flask": {
+            "hashes": [
+                "sha256:2271c0070dbcb5275fad4a82e29f23ab92682dc45f9dfbc22c02ba9b9322ce48",
+                "sha256:a080b744b7e345ccfcbc77954861cb05b3c63786e93f2b3875e0913d44b43f05"
+            ],
+            "version": "==1.0.2"
+        },
+        "funcsigs": {
+            "hashes": [
+                "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca",
+                "sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50"
+            ],
+            "markers": "python_version < '3.3'",
+            "version": "==1.0.2"
+        },
+        "future": {
+            "hashes": [
+                "sha256:e39ced1ab767b5936646cedba8bcce582398233d6a627067d4c6a454c90cfedb"
+            ],
+            "version": "==0.16.0"
+        },
+        "greenlet": {
+            "hashes": [
+                "sha256:09ef2636ea35782364c830f07127d6c7a70542b178268714a9a9ba16318e7e8b",
+                "sha256:0fef83d43bf87a5196c91e73cb9772f945a4caaff91242766c5916d1dd1381e4",
+                "sha256:1b7df09c6598f5cfb40f843ade14ed1eb40596e75cd79b6fa2efc750ba01bb01",
+                "sha256:1fff21a2da5f9e03ddc5bd99131a6b8edf3d7f9d6bc29ba21784323d17806ed7",
+                "sha256:42118bf608e0288e35304b449a2d87e2ba77d1e373e8aa221ccdea073de026fa",
+                "sha256:50643fd6d54fd919f9a0a577c5f7b71f5d21f0959ab48767bd4bb73ae0839500",
+                "sha256:58798b5d30054bb4f6cf0f712f08e6092df23a718b69000786634a265e8911a9",
+                "sha256:5b49b3049697aeae17ef7bf21267e69972d9e04917658b4e788986ea5cc518e8",
+                "sha256:75c413551a436b462d5929255b6dc9c0c3c2b25cbeaee5271a56c7fda8ca49c0",
+                "sha256:769b740aeebd584cd59232be84fdcaf6270b8adc356596cdea5b2152c82caaac",
+                "sha256:ad2383d39f13534f3ca5c48fe1fc0975676846dc39c2cece78c0f1f9891418e0",
+                "sha256:b417bb7ff680d43e7bd7a13e2e08956fa6acb11fd432f74c97b7664f8bdb6ec1",
+                "sha256:b6ef0cabaf5a6ecb5ac122e689d25ba12433a90c7b067b12e5f28bdb7fb78254",
+                "sha256:c2de19c88bdb0366c976cc125dca1002ec1b346989d59524178adfd395e62421",
+                "sha256:c7b04a6dc74087b1598de8d713198de4718fa30ec6cbb84959b26426c198e041",
+                "sha256:f8f2a0ae8de0b49c7b5b2daca4f150fdd9c1173e854df2cce3b04123244f9f45",
+                "sha256:fcfadaf4bf68a27e5dc2f42cbb2f4b4ceea9f05d1d0b8f7787e640bed2801634"
+            ],
+            "version": "==0.4.13"
+        },
+        "html5lib": {
+            "hashes": [
+                "sha256:20b159aa3badc9d5ee8f5c647e5efd02ed2a66ab8d354930bd9ff139fc1dc0a3",
+                "sha256:66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736"
+            ],
+            "version": "==1.0.1"
+        },
+        "httpbin": {
+            "hashes": [
+                "sha256:7a04b5904c80b7aa04dd0a6af6520d68ce17a5db175e66a64b971f8e93d73a26",
+                "sha256:cbb37790c91575f4f15757f42ad41d9f729eb227d5edbe89e4ec175486db8dfa"
+            ],
+            "index": "pypi",
+            "version": "==0.7.0"
+        },
+        "idna": {
+            "hashes": [
+                "sha256:2c6a5de3089009e3da7c5dde64a141dbc8551d5b7f6cf4ed7c2568d0cc520a8f",
+                "sha256:8c7309c718f94b3a625cb648ace320157ad16ff131ae0af362c9f21b80ef6ec4"
+            ],
+            "version": "==2.6"
+        },
+        "imagesize": {
+            "hashes": [
+                "sha256:3620cc0cadba3f7475f9940d22431fc4d407269f1be59ec9b8edcca26440cf18",
+                "sha256:5b326e4678b6925158ccc66a9fa3122b6106d7c876ee32d7de6ce59385b96315"
+            ],
+            "version": "==1.0.0"
+        },
+        "itsdangerous": {
+            "hashes": [
+                "sha256:cbb3fcf8d3e33df861709ecaf89d9e6629cff0a217bc2848f1b41cd30d360519"
+            ],
+            "version": "==0.24"
+        },
+        "jinja2": {
+            "hashes": [
+                "sha256:74c935a1b8bb9a3947c50a54766a969d4846290e1e788ea44c1392163723c3bd",
+                "sha256:f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4"
+            ],
+            "version": "==2.10"
+        },
+        "markupsafe": {
+            "hashes": [
+                "sha256:a6be69091dac236ea9c6bc7d012beab42010fa914c459791d627dad4910eb665"
+            ],
+            "version": "==1.0"
+        },
+        "mccabe": {
+            "hashes": [
+                "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42",
+                "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"
+            ],
+            "version": "==0.6.1"
+        },
+        "mock": {
+            "hashes": [
+                "sha256:5ce3c71c5545b472da17b72268978914d0252980348636840bd34a00b5cc96c1",
+                "sha256:b158b6df76edd239b8208d481dc46b6afd45a846b7812ff0ce58971cf5bc8bba"
+            ],
+            "markers": "python_version < '3.0'",
+            "version": "==2.0.0"
+        },
+        "more-itertools": {
+            "hashes": [
+                "sha256:0dd8f72eeab0d2c3bd489025bb2f6a1b8342f9b198f6fc37b52d15cfa4531fea",
+                "sha256:11a625025954c20145b37ff6309cd54e39ca94f72f6bb9576d1195db6fa2442e",
+                "sha256:c9ce7eccdcb901a2c75d326ea134e0886abfbea5f93e91cc95de9507c0816c44"
+            ],
+            "version": "==4.1.0"
+        },
+        "pbr": {
+            "hashes": [
+                "sha256:680bf5ba9b28dd56e08eb7c267991a37c7a5f90a92c2e07108829931a50ff80a",
+                "sha256:6874feb22334a1e9a515193cba797664e940b763440c88115009ec323a7f2df5"
+            ],
+            "version": "==4.0.3"
+        },
+        "pluggy": {
+            "hashes": [
+                "sha256:7f8ae7f5bdf75671a718d2daf0a64b7885f74510bcd98b1a0bb420eb9a9d0cff",
+                "sha256:d345c8fe681115900d6da8d048ba67c25df42973bda370783cd58826442dcd7c",
+                "sha256:e160a7fcf25762bb60efc7e171d4497ff1d8d2d75a3d0df7a21b76821ecbf5c5"
+            ],
+            "version": "==0.6.0"
+        },
+        "py": {
+            "hashes": [
+                "sha256:29c9fab495d7528e80ba1e343b958684f4ace687327e6f789a94bf3d1915f881",
+                "sha256:983f77f3331356039fdd792e9220b7b8ee1aa6bd2b25f567a963ff1de5a64f6a"
+            ],
+            "version": "==1.5.3"
+        },
+        "pycodestyle": {
+            "hashes": [
+                "sha256:682256a5b318149ca0d2a9185d365d8864a768a28db66a84a2ea946bcc426766",
+                "sha256:6c4245ade1edfad79c3446fadfc96b0de2759662dc29d07d80a6f27ad1ca6ba9"
+            ],
+            "version": "==2.3.1"
+        },
+        "pycparser": {
+            "hashes": [
+                "sha256:99a8ca03e29851d96616ad0404b4aad7d9ee16f25c9f9708a11faf2810f7b226"
+            ],
+            "version": "==2.18"
+        },
+        "pyflakes": {
+            "hashes": [
+                "sha256:08bd6a50edf8cffa9fa09a463063c425ecaaf10d1eb0335a7e8b1401aef89e6f",
+                "sha256:8d616a382f243dbf19b54743f280b80198be0bca3a5396f1d2e1fca6223e8805"
+            ],
+            "version": "==1.6.0"
+        },
+        "pygments": {
+            "hashes": [
+                "sha256:78f3f434bcc5d6ee09020f92ba487f95ba50f1e3ef83ae96b9d5ffa1bab25c5d",
+                "sha256:dbae1046def0efb574852fab9e90209b23f556367b5a320c0bcb871c77c3e8cc"
+            ],
+            "version": "==2.2.0"
+        },
+        "pysocks": {
+            "hashes": [
+                "sha256:3fe52c55890a248676fd69dc9e3c4e811718b777834bcaab7a8125cf9deac672"
+            ],
+            "version": "==1.6.8"
+        },
+        "pytest": {
+            "hashes": [
+                "sha256:54713b26c97538db6ff0703a12b19aeaeb60b5e599de542e7fca0ec83b9038e8",
+                "sha256:829230122facf05a5f81a6d4dfe6454a04978ea3746853b2b84567ecf8e5c526"
+            ],
+            "index": "pypi",
+            "version": "==3.5.1"
+        },
+        "pytest-cov": {
+            "hashes": [
+                "sha256:03aa752cf11db41d281ea1d807d954c4eda35cfa1b21d6971966cc041bbf6e2d",
+                "sha256:890fe5565400902b0c78b5357004aab1c814115894f4f21370e2433256a3eeec"
+            ],
+            "index": "pypi",
+            "version": "==2.5.1"
+        },
+        "pytest-forked": {
+            "hashes": [
+                "sha256:e4500cd0509ec4a26535f7d4112a8cc0f17d3a41c29ffd4eab479d2a55b30805",
+                "sha256:f275cb48a73fc61a6710726348e1da6d68a978f0ec0c54ece5a5fae5977e5a08"
+            ],
+            "version": "==0.2"
+        },
+        "pytest-httpbin": {
+            "hashes": [
+                "sha256:8cd57e27418a7d7d205fcc9802eea246ed06170e3065abfa76c6d9b40553592c",
+                "sha256:d3919c5df0b644454129c0066a8ae62db40ac54bacb4cfd89d8cfa58615a4b42"
+            ],
+            "index": "pypi",
+            "version": "==0.3.0"
+        },
+        "pytest-mock": {
+            "hashes": [
+                "sha256:53801e621223d34724926a5c98bd90e8e417ce35264365d39d6c896388dcc928",
+                "sha256:d89a8209d722b8307b5e351496830d5cc5e192336003a485443ae9adeb7dd4c0"
+            ],
+            "index": "pypi",
+            "version": "==1.10.0"
+        },
+        "pytest-xdist": {
+            "hashes": [
+                "sha256:be2662264b035920ba740ed6efb1c816a83c8a22253df7766d129f6a7bfdbd35",
+                "sha256:e8f5744acc270b3e7d915bdb4d5f471670f049b6fbd163d4cbd52203b075d30f"
+            ],
+            "index": "pypi",
+            "version": "==1.22.2"
+        },
+        "pytz": {
+            "hashes": [
+                "sha256:65ae0c8101309c45772196b21b74c46b2e5d11b6275c45d251b150d5da334555",
+                "sha256:c06425302f2cf668f1bba7a0a03f3c1d34d4ebeef2c72003da308b3947c7f749"
+            ],
+            "version": "==2018.4"
+        },
+        "raven": {
+            "hashes": [
+                "sha256:1c641e5ebc2d4185560608e253970ca0d4b98475f4edf67735015a415f9e1d48",
+                "sha256:95aecf76c414facaddbb056f3e98c7936318123e467728f2e50b3a66b65a6ef7"
+            ],
+            "version": "==6.8.0"
+        },
+        "readme-renderer": {
+            "hashes": [
+                "sha256:bde909eaa84d65b7942f7e6998c8b427b90b568b2630ff0306f4ca75f6d2a909",
+                "sha256:e7e43a7ba49f08c3cb660d0f2e25b561f6b10b36c63f029060230aab2dc2875e"
+            ],
+            "index": "pypi",
+            "version": "==20.0"
+        },
+        "requests": {
+            "hashes": [
+                "sha256:6a1b267aa90cac58ac3a765d067950e7dbbf75b1da07e895d1f594193a40a38b",
+                "sha256:9c443e7324ba5b85070c4a818ade28bfabedf16ea10206da1132edaa6dda237e"
+            ],
+            "version": "==2.18.4"
+        },
+        "six": {
+            "hashes": [
+                "sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9",
+                "sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb"
+            ],
+            "version": "==1.11.0"
+        },
+        "snowballstemmer": {
+            "hashes": [
+                "sha256:919f26a68b2c17a7634da993d91339e288964f93c274f1343e3bbbe2096e1128",
+                "sha256:9f3bcd3c401c3e862ec0ebe6d2c069ebc012ce142cce209c098ccb5b09136e89"
+            ],
+            "version": "==1.2.1"
+        },
+        "sphinx": {
+            "hashes": [
+                "sha256:11f271e7a9398385ed730e90f0bb41dc3815294bdcd395b46ed2d033bc2e7d87",
+                "sha256:4064ea6c56feeb268838cb8fbbee507d0c3d5d92fa63a7df935a916b52c9e2f5"
+            ],
+            "index": "pypi",
+            "version": "==1.5.5"
+        },
+        "tox": {
+            "hashes": [
+                "sha256:96efa09710a3daeeb845561ebbe1497641d9cef2ee0aea30db6969058b2bda2f",
+                "sha256:9ee7de958a43806402a38c0d2aa07fa8553f4d2c20a15b140e9f771c2afeade0"
+            ],
+            "index": "pypi",
+            "version": "==3.0.0"
+        },
+        "urllib3": {
+            "hashes": [
+                "sha256:06330f386d6e4b195fbfc736b297f58c5a892e4440e54d294d7004e3a9bbea1b",
+                "sha256:cc44da8e1145637334317feebd728bd869a35285b93cbb4cca2577da7e62db4f"
+            ],
+            "version": "==1.22"
+        },
+        "virtualenv": {
+            "hashes": [
+                "sha256:1d7e241b431e7afce47e77f8843a276f652699d1fa4f93b9d8ce0076fd7b0b54",
+                "sha256:e8e05d4714a1c51a2f5921e62f547fcb0f713ebbe959e0a7f585cc8bef71d11f"
+            ],
+            "version": "==15.2.0"
+        },
+        "webencodings": {
+            "hashes": [
+                "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78",
+                "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"
+            ],
+            "version": "==0.5.1"
+        },
+        "werkzeug": {
+            "hashes": [
+                "sha256:c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c",
+                "sha256:d5da73735293558eb1651ee2fddc4d0dedcfa06538b8813a2e20011583c9e49b"
+            ],
+            "version": "==0.14.1"
+        }
+    }
+}

README.rst

@@ -2,13 +2,13 @@ Requests: HTTP for Humans
 =========================
 
 .. image:: https://img.shields.io/pypi/v/requests.svg
-    :target: https://pypi.python.org/pypi/requests
+    :target: https://pypi.org/project/requests/
 
 .. image:: https://img.shields.io/pypi/l/requests.svg
-    :target: https://pypi.python.org/pypi/requests
+    :target: https://pypi.org/project/requests/
 
 .. image:: https://img.shields.io/pypi/pyversions/requests.svg
-    :target: https://pypi.python.org/pypi/requests
+    :target: https://pypi.org/project/requests/
 
 .. image:: https://codecov.io/github/requests/requests/coverage.svg?branch=master
     :target: https://codecov.io/github/requests/requests
@@ -77,7 +77,7 @@ Requests is ready for today's web.
 - ``.netrc`` Support
 - Chunked Requests
 
-Requests officially supports Python 2.7 & 3.4–3.7, and runs great on PyPy.
+Requests officially supports Python 2.7 & 3.4–3.6, and runs great on PyPy.
 
 Installation
 ------------
@@ -105,6 +105,6 @@ How to Contribute
 #. Write a test which shows that the bug was fixed or that the feature works as expected.
 #. Send a pull request and bug the maintainer until it gets merged and published. :) Make sure to add yourself to AUTHORS_.
 
-.. _`the repository`: http://github.com/requests/requests
+.. _`the repository`: https://github.com/requests/requests
 .. _AUTHORS: https://github.com/requests/requests/blob/master/AUTHORS.rst
 .. _Contributor Friendly: https://github.com/requests/requests/issues?direction=desc&labels=Contributor+Friendly&page=1&sort=updated&state=open

appveyor.yml

@@ -5,6 +5,21 @@ build: off
 
 environment:
   matrix:
+    - PYTHON: "C:\\Python27-x64"
+      PYTHON_VERSION: "2.7.x"
+      PYTHON_ARCH: "64"
+      TOXENV: "py27"
+
+    - PYTHON: "C:\\Python34-x64"
+      PYTHON_VERSION: "3.4.x"
+      PYTHON_ARCH: "64"
+      TOXENV: "py34"
+
+    - PYTHON: "C:\\Python35-x64"
+      PYTHON_VERSION: "3.5.x"
+      PYTHON_ARCH: "64"
+      TOXENV: "py35"
+
     - PYTHON: "C:\\Python36-x64"
       PYTHON_VERSION: "3.6.x"
       PYTHON_ARCH: "64"
@@ -26,8 +41,9 @@ install:
 
   # Upgrade to the latest version of pip to avoid it displaying warnings
   # about it being out of date.
-  - "pip install --disable-pip-version-check --user --upgrade pip"
+  - "python -m pip install --upgrade pip wheel"
   - "C:\\MinGW\\bin\\mingw32-make"
+  - "pipenv install -e .[socks] --skip-lock"
 
 test_script:
   - "C:\\MinGW\\bin\\mingw32-make coverage"

docs/_static/custom.css

@@ -1,3 +1,11 @@
+body > div.document > div.sphinxsidebar > div > form > table > tbody > tr:nth-child(2) > td > select {
+  width: 100%!important;
+}
+
+#python27 > a {
+  color: white;
+}
+
 #carbonads {
   display: block;
   overflow: hidden;

docs/_templates/hacks.html

@@ -1,7 +1,6 @@
 <!-- Alabaster (krTheme++) Hacks -->
 <aside id="python27">
-    Python 3, the new best practice, is here to stay.
-    Python 2 will retire in only <time></time> months!
+    <a href="https://www.kennethreitz.org/requests3"><strong>Requests 3.0</strong> development is underway, and your financial help is appreciated!</a>
 </aside>
 
 <!-- Python 2 Death Clock™ -->
@@ -20,14 +19,14 @@
   }
 
 </style>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.18.1/moment.min.js"></script>
+<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.18.1/moment.min.js"></script>
 <script>
   var death = new Date('2020-04-12');
 
   var diff = moment.duration(death - moment());
 
   document.querySelector('#python27 time').innerText = (diff.years() * 12) + diff.months();
-</script>
+</script> -->
 
 
 <!-- CSS Adjustments (I'm very picky.) -->

docs/_templates/sidebarintro.html

@@ -5,7 +5,7 @@
 </p>
 
 <p>
-  <iframe src="http://ghbtns.com/github-btn.html?user=requests&repo=requests&type=watch&count=true&size=large"
+  <iframe src="https://ghbtns.com/github-btn.html?user=requests&repo=requests&type=watch&count=true&size=large"
     allowtransparency="true" frameborder="0" scrolling="0" width="200px" height="35px"></iframe>
 </p>
 
@@ -13,24 +13,26 @@
   Requests is an elegant and simple HTTP library for Python, built for
   human beings.
 </p>
+<p>Sponsored by <strong><a href="https://linode.com/">Linode</a></strong> and <a href="http://docs.python-requests.org/en/master/community/sponsors/#patron-sponsors">other wonderful organizations</a>.</p>
+
 
 <script async type="text/javascript" src="//cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=pythonrequestsorg" id="_carbonads_js"></script>
 
-<h3><a href="http://www.unixstickers.com/stickers/coding_stickers/requests-shaped-sticker">Stickers!</a></h3>
+<p><a href="http://www.unixstickers.com/stickers/coding_stickers/requests-shaped-sticker">Requests Stickers!</a></p>
 <h3>Stay Informed</h3>
 <p>Receive updates on new releases and upcoming projects.</p>
 
-<p><iframe src="http://ghbtns.com/github-btn.html?user=kennethreitz&type=follow&count=false"
+<p><iframe src="https://ghbtns.com/github-btn.html?user=kennethreitz&type=follow&count=false"
   allowtransparency="true" frameborder="0" scrolling="0" width="200" height="20"></iframe></p>
 
 <p><a href="https://twitter.com/kennethreitz" class="twitter-follow-button" data-show-count="false">Follow @kennethreitz</a> <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
-<p><a href="https://saythanks.io/to/kennethreitz">Say Thanks!</a></p>
 <p><a href="http://tinyletter.com/kennethreitz">Join Mailing List</a>.</p>
 <h3>Other Projects</h3>
 
 <p>More <a href="http://kennethreitz.org/">Kenneth Reitz</a> projects:</p>
 <ul>
-    <li><a href="http://edmsynths.com/">edmsynths.com</a></li>
+    <li><a href="http://html.python-requests.org/">Requests-HTML</a></li>
+    <li><a href="http://howtopython.org/">howtopython.org</a></li>
     <li><a href="http://pipenv.org/">pipenv</a></li>
     <li><a href="http://pep8.org/">pep8.org</a></li>
     <li><a href="http://httpbin.org/">httpbin.org</a></li>
@@ -48,9 +50,9 @@
 
   <p></p>
 
-  <li><a href="http://github.com/requests/requests">Requests @ GitHub</a></li>
-  <li><a href="http://pypi.python.org/pypi/requests">Requests @ PyPI</a></li>
-  <li><a href="http://github.com/requests/requests/issues">Issue Tracker</a></li>
+  <li><a href="https://github.com/requests/requests">Requests @ GitHub</a></li>
+  <li><a href="https://pypi.org/project/requests/">Requests @ PyPI</a></li>
+  <li><a href="https://github.com/requests/requests/issues">Issue Tracker</a></li>
   <li><a href="http://docs.python-requests.org/en/latest/community/updates/#software-updates">Release History</a></li>
 </ul>
 
@@ -67,4 +69,3 @@
   <li><a href="http://it.python-requests.org/">Italian</a></li>
   <li><a href="http://es.python-requests.org/">Spanish</a></li>
 </ul>
-

docs/_templates/sidebarlogo.html

@@ -4,28 +4,31 @@
   </a>
 </p>
 <p>
-<iframe src="http://ghbtns.com/github-btn.html?user=requests&repo=requests&type=watch&count=true&size=large"
+<iframe src="https://ghbtns.com/github-btn.html?user=requests&repo=requests&type=watch&count=true&size=large"
   allowtransparency="true" frameborder="0" scrolling="0" width="200px" height="35px"></iframe>
 </p>
 
+
 <p>
   Requests is an elegant and simple HTTP library for Python, built for
   human beings. You are currently looking at the documentation of the
   development release.
 </p>
-<h3><a href="http://www.unixstickers.com/stickers/coding_stickers/requests-shaped-sticker">Stickers!</a></h3>
+
+<p>Sponsored by <strong><a href="https://linode.com/">Linode</a></strong> and <a href="http://docs.python-requests.org/en/master/community/sponsors/#patron-sponsors">other wonderful organizations</a>.</p>
+
 <h3>Stay Informed</h3>
 <p>Receive updates on new releases and upcoming projects.</p>
 
+<p><a href="http://www.unixstickers.com/stickers/coding_stickers/requests-shaped-sticker">Requests Stickers!</a></p>
+
 <p><a href="http://tinyletter.com/kennethreitz">Join Mailing List</a>.</p>
 
 <hr/>
 
 <script async type="text/javascript" src="//cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=pythonrequestsorg" id="_carbonads_js"></script>
 
-<p>If you enjoy using this project, <a href="https://saythanks.io/to/kennethreitz">Say Thanks!</a></p>
-
-<p><iframe src="http://ghbtns.com/github-btn.html?user=kennethreitz&type=follow&count=false"
+<p><iframe src="https://ghbtns.com/github-btn.html?user=kennethreitz&type=follow&count=false"
   allowtransparency="true" frameborder="0" scrolling="0" width="200" height="20"></iframe></p>
 
 <p><a href="https://twitter.com/kennethreitz" class="twitter-follow-button" data-show-count="false">Follow @kennethreitz</a> <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
@@ -35,7 +38,8 @@
 
 <p>More <a href="http://kennethreitz.org/">Kenneth Reitz</a> projects:</p>
 <ul>
-    <li><a href="http://edmsynths.com/">edmsynths.com</a></li>
+    <li><a href="http://html.python-requests.org/">Requests-HTML</a></li>
+    <li><a href="http://howtopython.org/">howtopython.org</a></li>
     <li><a href="http://pipenv.org/">pipenv</a></li>
     <li><a href="http://pep8.org/">pep8.org</a></li>
     <li><a href="http://httpbin.org/">httpbin.org</a></li>
@@ -59,4 +63,3 @@
   <li><a href="http://it.python-requests.org/">Italian</a></li>
   <li><a href="http://es.python-requests.org/">Spanish</a></li>
 </ul>
-

docs/_themes/flask_theme_support.py

@@ -1,76 +1,86 @@
 # flasky extensions.  flasky pygments style based on tango style
 from pygments.style import Style
-from pygments.token import Keyword, Name, Comment, String, Error, Number, Operator, Generic, Whitespace, Punctuation, Other, Literal
+from pygments.token import Keyword, Name, Comment, String, Error, \
+     Number, Operator, Generic, Whitespace, Punctuation, Other, Literal
 
 
 class FlaskyStyle(Style):
     background_color = "#f8f8f8"
     default_style = ""
+
     styles = {
         # No corresponding class for the following:
         #Text:                     "", # class:  ''
-        Whitespace: "underline #f8f8f8",  # class: 'w'
-        Error: "#a40000 border:#ef2929",  # class: 'err'
-        Other: "#000000",  # class 'x'
-        Comment: "italic #8f5902",  # class: 'c'
-        Comment.Preproc: "noitalic",  # class: 'cp'
-        Keyword: "bold #004461",  # class: 'k'
-        Keyword.Constant: "bold #004461",  # class: 'kc'
-        Keyword.Declaration: "bold #004461",  # class: 'kd'
-        Keyword.Namespace: "bold #004461",  # class: 'kn'
-        Keyword.Pseudo: "bold #004461",  # class: 'kp'
-        Keyword.Reserved: "bold #004461",  # class: 'kr'
-        Keyword.Type: "bold #004461",  # class: 'kt'
-        Operator: "#582800",  # class: 'o'
-        Operator.Word: "bold #004461",  # class: 'ow' - like keywords
-        Punctuation: "bold #000000",
-        # class: 'p'
+        Whitespace:                "underline #f8f8f8",      # class: 'w'
+        Error:                     "#a40000 border:#ef2929", # class: 'err'
+        Other:                     "#000000",                # class 'x'
+
+        Comment:                   "italic #8f5902", # class: 'c'
+        Comment.Preproc:           "noitalic",       # class: 'cp'
+
+        Keyword:                   "bold #004461",   # class: 'k'
+        Keyword.Constant:          "bold #004461",   # class: 'kc'
+        Keyword.Declaration:       "bold #004461",   # class: 'kd'
+        Keyword.Namespace:         "bold #004461",   # class: 'kn'
+        Keyword.Pseudo:            "bold #004461",   # class: 'kp'
+        Keyword.Reserved:          "bold #004461",   # class: 'kr'
+        Keyword.Type:              "bold #004461",   # class: 'kt'
+
+        Operator:                  "#582800",   # class: 'o'
+        Operator.Word:             "bold #004461",   # class: 'ow' - like keywords
+
+        Punctuation:               "bold #000000",   # class: 'p'
+
         # because special names such as Name.Class, Name.Function, etc.
         # are not recognized as such later in the parsing, we choose them
         # to look the same as ordinary variables.
-        Name: "#000000",  # class: 'n'
-        Name.Attribute: "#c4a000",  # class: 'na' - to be revised
-        Name.Builtin: "#004461",  # class: 'nb'
-        Name.Builtin.Pseudo: "#3465a4",  # class: 'bp'
-        Name.Class: "#000000",  # class: 'nc' - to be revised
-        Name.Constant: "#000000",  # class: 'no' - to be revised
-        Name.Decorator: "#888",  # class: 'nd' - to be revised
-        Name.Entity: "#ce5c00",  # class: 'ni'
-        Name.Exception: "bold #cc0000",  # class: 'ne'
-        Name.Function: "#000000",  # class: 'nf'
-        Name.Property: "#000000",  # class: 'py'
-        Name.Label: "#f57900",  # class: 'nl'
-        Name.Namespace: "#000000",  # class: 'nn' - to be revised
-        Name.Other: "#000000",  # class: 'nx'
-        Name.Tag: "bold #004461",  # class: 'nt' - like a keyword
-        Name.Variable: "#000000",  # class: 'nv' - to be revised
-        Name.Variable.Class: "#000000",  # class: 'vc' - to be revised
-        Name.Variable.Global: "#000000",  # class: 'vg' - to be revised
-        Name.Variable.Instance: "#000000",  # class: 'vi' - to be revised
-        Number: "#990000",  # class: 'm'
-        Literal: "#000000",  # class: 'l'
-        Literal.Date: "#000000",  # class: 'ld'
-        String: "#4e9a06",  # class: 's'
-        String.Backtick: "#4e9a06",  # class: 'sb'
-        String.Char: "#4e9a06",  # class: 'sc'
-        String.Doc: "italic #8f5902",  # class: 'sd' - like a comment
-        String.Double: "#4e9a06",  # class: 's2'
-        String.Escape: "#4e9a06",  # class: 'se'
-        String.Heredoc: "#4e9a06",  # class: 'sh'
-        String.Interpol: "#4e9a06",  # class: 'si'
-        String.Other: "#4e9a06",  # class: 'sx'
-        String.Regex: "#4e9a06",  # class: 'sr'
-        String.Single: "#4e9a06",  # class: 's1'
-        String.Symbol: "#4e9a06",  # class: 'ss'
-        Generic: "#000000",  # class: 'g'
-        Generic.Deleted: "#a40000",  # class: 'gd'
-        Generic.Emph: "italic #000000",  # class: 'ge'
-        Generic.Error: "#ef2929",  # class: 'gr'
-        Generic.Heading: "bold #000080",  # class: 'gh'
-        Generic.Inserted: "#00A000",  # class: 'gi'
-        Generic.Output: "#888",  # class: 'go'
-        Generic.Prompt: "#745334",  # class: 'gp'
-        Generic.Strong: "bold #000000",  # class: 'gs'
-        Generic.Subheading: "bold #800080",  # class: 'gu'
-        Generic.Traceback: "bold #a40000",  # class: 'gt'
+        Name:                      "#000000",        # class: 'n'
+        Name.Attribute:            "#c4a000",        # class: 'na' - to be revised
+        Name.Builtin:              "#004461",        # class: 'nb'
+        Name.Builtin.Pseudo:       "#3465a4",        # class: 'bp'
+        Name.Class:                "#000000",        # class: 'nc' - to be revised
+        Name.Constant:             "#000000",        # class: 'no' - to be revised
+        Name.Decorator:            "#888",           # class: 'nd' - to be revised
+        Name.Entity:               "#ce5c00",        # class: 'ni'
+        Name.Exception:            "bold #cc0000",   # class: 'ne'
+        Name.Function:             "#000000",        # class: 'nf'
+        Name.Property:             "#000000",        # class: 'py'
+        Name.Label:                "#f57900",        # class: 'nl'
+        Name.Namespace:            "#000000",        # class: 'nn' - to be revised
+        Name.Other:                "#000000",        # class: 'nx'
+        Name.Tag:                  "bold #004461",   # class: 'nt' - like a keyword
+        Name.Variable:             "#000000",        # class: 'nv' - to be revised
+        Name.Variable.Class:       "#000000",        # class: 'vc' - to be revised
+        Name.Variable.Global:      "#000000",        # class: 'vg' - to be revised
+        Name.Variable.Instance:    "#000000",        # class: 'vi' - to be revised
+
+        Number:                    "#990000",        # class: 'm'
+
+        Literal:                   "#000000",        # class: 'l'
+        Literal.Date:              "#000000",        # class: 'ld'
+
+        String:                    "#4e9a06",        # class: 's'
+        String.Backtick:           "#4e9a06",        # class: 'sb'
+        String.Char:               "#4e9a06",        # class: 'sc'
+        String.Doc:                "italic #8f5902", # class: 'sd' - like a comment
+        String.Double:             "#4e9a06",        # class: 's2'
+        String.Escape:             "#4e9a06",        # class: 'se'
+        String.Heredoc:            "#4e9a06",        # class: 'sh'
+        String.Interpol:           "#4e9a06",        # class: 'si'
+        String.Other:              "#4e9a06",        # class: 'sx'
+        String.Regex:              "#4e9a06",        # class: 'sr'
+        String.Single:             "#4e9a06",        # class: 's1'
+        String.Symbol:             "#4e9a06",        # class: 'ss'
+
+        Generic:                   "#000000",        # class: 'g'
+        Generic.Deleted:           "#a40000",        # class: 'gd'
+        Generic.Emph:              "italic #000000", # class: 'ge'
+        Generic.Error:             "#ef2929",        # class: 'gr'
+        Generic.Heading:           "bold #000080",   # class: 'gh'
+        Generic.Inserted:          "#00A000",        # class: 'gi'
+        Generic.Output:            "#888",           # class: 'go'
+        Generic.Prompt:            "#745334",        # class: 'gp'
+        Generic.Strong:            "bold #000000",   # class: 'gs'
+        Generic.Subheading:        "bold #800080",   # class: 'gu'
+        Generic.Traceback:         "bold #a40000",   # class: 'gt'
     }

docs/api.rst

@@ -74,6 +74,7 @@ Authentication
 
 .. autoclass:: requests.auth.AuthBase
 .. autoclass:: requests.auth.HTTPBasicAuth
+.. autoclass:: requests.auth.HTTPProxyAuth
 .. autoclass:: requests.auth.HTTPDigestAuth
 
 
@@ -108,17 +109,7 @@ Status Code Lookup
 
 .. autoclass:: requests.codes
 
-::
-
-    >>> requests.codes['temporary_redirect']
-    307
-
-    >>> requests.codes.teapot
-    418
-
-    >>> requests.codes['\o/']
-    200
-
+.. automodule:: requests.status_codes
 
 
 Migrating to 1.x
@@ -190,7 +181,7 @@ API Changes
 
       logging.basicConfig() # you need to initialize logging, otherwise you will not see anything from requests
       logging.getLogger().setLevel(logging.DEBUG)
-      requests_log = logging.getLogger("requests.packages.urllib3")
+      requests_log = logging.getLogger("urllib3")
       requests_log.setLevel(logging.DEBUG)
       requests_log.propagate = True
 
@@ -251,7 +242,7 @@ API Changes
       }
 
       # In requests 1.x, this was legal, in requests 2.x,
-      #  this raises requests.exceptions.MissingScheme
+      #  this raises requests.exceptions.MissingSchema
       requests.get("http://example.org", proxies=proxies)
 
 

docs/community/out-there.rst

@@ -18,7 +18,7 @@ Articles & Talks
 - `Python for the Web <http://gun.io/blog/python-for-the-web/>`_ teaches how to use Python to interact with the web, using Requests.
 - `Daniel Greenfeld's Review of Requests <http://pydanny.blogspot.com/2011/05/python-http-requests-for-humans.html>`_
 - `My 'Python for Humans' talk <http://python-for-humans.heroku.com>`_ ( `audio <http://codeconf.s3.amazonaws.com/2011/pycodeconf/talks/PyCodeConf2011%20-%20Kenneth%20Reitz.m4a>`_ )
-- `Issac Kelly's 'Consuming Web APIs' talk <http://issackelly.github.com/Consuming-Web-APIs-with-Python-Talk/slides/slides.html>`_
+- `Issac Kelly's 'Consuming Web APIs' talk <https://issackelly.github.com/Consuming-Web-APIs-with-Python-Talk/slides/slides.html>`_
 - `Blog post about Requests via Yum <http://arunsag.wordpress.com/2011/08/17/new-package-python-requests-http-for-humans/>`_
 - `Russian blog post introducing Requests <http://habrahabr.ru/blogs/python/126262/>`_
 - `Sending JSON in Requests <http://www.coglib.com/~icordasc/blog/2014/11/sending-json-in-requests.html>`_

docs/community/recommended.rst

@@ -15,7 +15,7 @@ Certifi CA Bundle
 validating the trustworthiness of SSL certificates while verifying the
 identity of TLS hosts. It has been extracted from the Requests project.
 
-.. _Certifi: http://certifi.io/en/latest/
+.. _Certifi: https://github.com/certifi/python-certifi
 
 CacheControl
 ------------
@@ -34,7 +34,7 @@ but do not belong in Requests proper. This library is actively maintained
 by members of the Requests core team, and reflects the functionality most
 requested by users within the community.
 
-.. _Requests-Toolbelt: http://toolbelt.readthedocs.io/en/latest/index.html
+.. _Requests-Toolbelt: https://toolbelt.readthedocs.io/en/latest/index.html
 
 
 Requests-Threads
@@ -62,6 +62,3 @@ Betamax
 A VCR imitation designed only for Python-Requests.
 
 .. _betamax: https://github.com/sigmavirus24/betamax
-
-
-

docs/community/release-process.rst

@@ -19,19 +19,18 @@ Breaking changes are changes that break backwards compatibility with prior
 versions. If the project were to change the ``text`` attribute on a
 ``Response`` object to a method, that would only happen in a Major release.
 
-Major releases may also include miscellaneous bug fixes and upgrades to
-vendored packages. The core developers of Requests are committed to providing
-a good user experience. This means we're also committed to preserving
-backwards compatibility as much as possible. Major releases will be infrequent
-and will need strong justifications before they are considered.
+Major releases may also include miscellaneous bug fixes. The core developers of
+Requests are committed to providing a good user experience. This means we're
+also committed to preserving backwards compatibility as much as possible. Major
+releases will be infrequent and will need strong justifications before they are
+considered.
 
 Minor Releases
 --------------
 
-A minor release will not include breaking changes but may include
-miscellaneous bug fixes and upgrades to vendored packages. If the previous
-version of Requests released was ``v10.2.7`` a minor release would be
-versioned as ``v10.3.0``.
+A minor release will not include breaking changes but may include miscellaneous
+bug fixes. If the previous version of Requests released was ``v10.2.7`` a minor
+release would be versioned as ``v10.3.0``.
 
 Minor releases will be backwards compatible with releases that have the same
 major version number. In other words, all versions that would start with

docs/community/sponsors.rst

@@ -0,0 +1,96 @@
+Community Sponsors
+==================
+
+**tl;dr**: Requests development is currently `funded by the Python community <https://www.kennethreitz.org/requests3>`_, and
+some wonderful organizations that utilize the software in their businesses.
+
+
+-------------------
+
+
+Requests is one of the most heavily–utilized Python packages in the world.
+
+It is used by major corporations worldwide for all tasks, both small and large — from writing one–off scripts to orchestrating millions of dollars of critical infrastructure.
+
+It's even embedded within pip, that tool that you use to install packages and deploy with every day!
+
+After losing our primary open source maintainer (who was sponsored by a company to work on Requests, and other projects, full–time), we are seeking community financial contributions towards the development of Requests 3.0.
+
+Patron Sponsors
+----------------
+
+
+`Linode — SSD Cloud Hosting & Linux Servers <https://www.linode.com>`_
+//////////////////////////////////////////////////////////////////////
+
+Whether you’re just getting started or deploying a complex system, launching a Linode cloud server has never been easier. They offer the fastest hardware and network in the industry with scalable environments, and their 24x7 customer support team is always standing by to help with any questions.
+
+✨🍰✨
+//////
+
+----------------------------------
+
+This slot is reserved for ethical organizations willing to invest $10,000 or more in Requests per year.
+
+By becoming a patron–level sponsor, your organization will receive the following benefits:
+
+- Prominent placement on the Requests documentation sidebar (~11,000 uniques / day).
+- Honorable mention here, with logo.
+- Peace of mind knowing that the infrastructure you rely on is being actively maintained.
+
+Organizations that sign up will be listed in order — first come first serve!
+
+Major Sponsors
+--------------
+
+The following organizations have significantly contributed towards Requests' sustainability:
+
+`Slack — Bring your team together <https://slack.com>`_
+///////////////////////////////////////////////////////
+
+Slack was extremely kind to be the first organization to generously donate a large sum towards the `2018 Requests 3.0 fundraiser <https://www.kennethreitz.org/requests3>`_, surpassing our entire fundraising goal immediately! They are helping the world become a better place through connectiveness, and reducing the amount of email we all have
+to deal with on a daily basis.
+
+P.S. They're `hiring <https://slack.com/careers#openings>`_!
+
+
+`Twilio — Voice, SMS, and Video for Humans <https://www.twilio.com>`_
+/////////////////////////////////////////////////////////////////////
+
+Twilio was the second organization to generously donate a large sum towards the `2018 Requests 3.0 fundraiser <https://www.kennethreitz.org/requests3>`_, matching the donation of Slack! They are helping the world become a better place through interconnectivity,
+providing easy–to–use APIs, and empowering developers world-over to help humans communicate in meaningful and effictive ways.
+
+
+`Azure Cloud Developer Advocates <https://developer.microsoft.com/en-us/advocates/>`_
+/////////////////////////////////////////////////////////////////////////////////////
+
+Azure was the third organization to generously donate a large sum towards the `2018 Requests 3.0 fundraiser <https://www.kennethreitz.org/requests3>`_, matching the donation of Twilio! Awesome group of generous folks :)
+
+
+`Niteo — Web Systems Development <https://www.niteoweb.com>`_
+/////////////////////////////////////////////////////////////
+
+Niteo was the fourth company to generously donate towards the `2018 Requests 3.0 fundraiser <https://www.kennethreitz.org/requests3>`_. Niteo is a company employing tech enthusiasts from all over the world
+who love to build great stuff.
+
+
+`Heroku <https://heroku.com/python>`_
+/////////////////////////////////////
+
+Heroku has allowed Kenneth Reitz to work on some open source projects during work hours,
+including Requests (but mostly Pipenv), from time–to–time, so they are listed
+here as an honorable mention.
+
+----------------
+
+If your organization is interested in becoming either a sponsor or a patron, please `send us an email <mailto:me@kennethreitz.org>`_.
+
+
+Individual Sponsors
+-------------------
+
+Countless individuals, too many to list here, have individually contributed towards the sustainability of the Requests
+project over the years. Some, financially, others, with code. Contributions (from humans) of all kinds are greatly
+appreciated.
+
+✨🍰✨

docs/community/updates.rst

@@ -29,4 +29,3 @@ Release and Version History
 ===========================
 
 .. include:: ../../HISTORY.rst
-

docs/conf.py

@@ -58,7 +58,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Requests'
-copyright = u'MMXVII. A <a href="http://kennethreitz.com/pages/open-projects.html">Kenneth Reitz</a> Project'
+copyright = u'MMXVIII. A <a href="http://kennethreitz.com/pages/open-projects.html">Kenneth Reitz</a> Project'
 author = u'Kenneth Reitz'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -376,4 +376,4 @@ epub_exclude_files = ['search.html']
 # If false, no index is generated.
 #epub_use_index = True
 
-intersphinx_mapping = {'urllib3': ('http://urllib3.readthedocs.io/en/latest', None)}
+intersphinx_mapping = {'urllib3': ('https://urllib3.readthedocs.io/en/latest', None)}

docs/dev/todo.rst

@@ -60,5 +60,4 @@ Requests currently supports the following versions of Python:
 Google AppEngine is not officially supported although support is available
 with the `Requests-Toolbelt`_.
 
-.. _Requests-Toolbelt: http://toolbelt.readthedocs.io/
-
+.. _Requests-Toolbelt: https://toolbelt.readthedocs.io/

docs/index.rst

@@ -9,13 +9,13 @@ Requests: HTTP for Humans
 Release v\ |version|. (:ref:`Installation <install>`)
 
 .. image:: https://img.shields.io/pypi/l/requests.svg
-    :target: https://pypi.python.org/pypi/requests
+    :target: https://pypi.org/project/requests/
 
 .. image:: https://img.shields.io/pypi/wheel/requests.svg
-    :target: https://pypi.python.org/pypi/requests
+    :target: https://pypi.org/project/requests/
 
 .. image:: https://img.shields.io/pypi/pyversions/requests.svg
-    :target: https://pypi.python.org/pypi/requests
+    :target: https://pypi.org/project/requests/
 
 .. image:: https://codecov.io/github/requests/requests/coverage.svg?branch=master
     :target: https://codecov.io/github/requests/requests
@@ -30,8 +30,8 @@ consumption.
 
 .. note:: The use of **Python 3** is *highly* preferred over Python 2. Consider upgrading your applications and infrastructure if you find yourself *still* using Python 2 in production today. If you are using Python 3, congratulations — you are indeed a person of excellent taste.
   —*Kenneth Reitz*
-  
-  
+
+
 -------------------
 
 **Behold, the power of Requests**::
@@ -59,12 +59,12 @@ are 100% automatic, thanks to `urllib3 <https://github.com/shazow/urllib3>`_.
 User Testimonials
 -----------------
 
-Twitter, Spotify, Microsoft, Amazon, Lyft, BuzzFeed, Reddit, The NSA, Her Majesty's Government, Google, Twilio, Runscope, Mozilla, Heroku,
+Nike, Twitter, Spotify, Microsoft, Amazon, Lyft, BuzzFeed, Reddit, The NSA, Her Majesty's Government, Google, Twilio, Runscope, Mozilla, Heroku,
 PayPal, NPR, Obama for America, Transifex, Native Instruments, The Washington
 Post, SoundCloud, Kippt, Sony, and Federal U.S.
 Institutions that prefer to be unnamed claim to use Requests internally.
 
-**Armin Ronacher**—
+**Armin Ronacher**, creator of Flask—
     *Requests is the perfect example how beautiful an API can be with the
     right level of abstraction.*
 
@@ -74,14 +74,18 @@ Institutions that prefer to be unnamed claim to use Requests internally.
 
 **Daniel Greenfeld**—
     *Nuked a 1200 LOC spaghetti code library with 10 lines of code thanks to
-    Kenneth Reitz's request library. Today has been AWESOME.*
+    Kenneth Reitz's Requests library. Today has been AWESOME.*
 
 **Kenny Meyers**—
     *Python HTTP: When in doubt, or when not in doubt, use Requests. Beautiful,
     simple, Pythonic.*
 
 Requests is one of the most downloaded Python packages of all time, pulling in
-over 13,000,000 downloads every month. All the cool kids are doing it!
+over 400,000 downloads **each day**. Join the party!
+
+If your organization uses Requests internally, consider `supporting the development of 3.0 <https://www.kennethreitz.org/requests3>`_. Your
+generosity will be greatly appreciated, and help drive the project forward
+into the future.
 
 Beloved Features
 ----------------
@@ -133,6 +137,7 @@ Requests ecosystem and community.
 .. toctree::
    :maxdepth: 2
 
+   community/sponsors
    community/recommended
    community/faq
    community/out-there

docs/user/advanced.rst

@@ -196,18 +196,18 @@ As a result an ``SSL: CERTIFICATE_VERIFY_FAILED`` is thrown.
 You can get around this behaviour by explicity merging the environment settings into your session::
 
     from requests import Request, Session
-    
+
     s = Session()
     req = Request('GET', url)
-    
+
     prepped = s.prepare_request(req)
-    
+
     # Merge environment settings into session
     settings = s.merge_environment_settings(prepped.url, None, None, None, None)
     resp = s.send(prepped, **settings)
-    
+
     print(resp.status_code)
-    
+
 .. _verification:
 
 SSL Cert Verification
@@ -274,21 +274,20 @@ If you specify a wrong path or an invalid cert, you'll get a SSLError::
 CA Certificates
 ---------------
 
-By default, Requests bundles a set of root CAs that it trusts, sourced from the
-`Mozilla trust store`_. However, these are only updated once for each Requests
-version. This means that if you pin a Requests version your certificates can
-become extremely out of date.
+Requests uses certificates from the package `certifi`_. This allows for users
+to update their trusted certificates without changing the version of Requests.
 
-From Requests version 2.4.0 onwards, Requests will attempt to use certificates
-from `certifi`_ if it is present on the system. This allows for users to update
-their trusted certificates without having to change the code that runs on their
-system.
+Before version 2.16, Requests bundled a set of root CAs that it trusted,
+sourced from the `Mozilla trust store`_. The certificates were only updated
+once for each Requests version. When ``certifi`` was not installed, this led to
+extremely out-of-date certificate bundles when using significantly older
+versions of Requests.
 
 For the sake of security we recommend upgrading certifi frequently!
 
 .. _HTTP persistent connection: https://en.wikipedia.org/wiki/HTTP_persistent_connection
-.. _connection pooling: http://urllib3.readthedocs.io/en/latest/reference/index.html#module-urllib3.connectionpool
-.. _certifi: http://certifi.io/
+.. _connection pooling: https://urllib3.readthedocs.io/en/latest/reference/index.html#module-urllib3.connectionpool
+.. _certifi: https://certifiio.readthedocs.io/
 .. _Mozilla trust store: https://hg.mozilla.org/mozilla-central/raw-file/tip/security/nss/lib/ckfw/builtins/certdata.txt
 
 .. _body-content-workflow:
@@ -358,7 +357,7 @@ file-like object for your body::
              be set to the number of *bytes* in the file. Errors may occur if
              you open the file in *text mode*.
 
-.. _binary mode: https://docs.python.org/2/tutorial/inputoutput.html#reading-and-writing-files
+.. _binary mode: https://docs.python.org/3/tutorial/inputoutput.html#reading-and-writing-files
 
 
 .. _chunk-encoding:
@@ -415,7 +414,7 @@ To do that, just set files to a list of tuples of ``(form_field_name, file_info)
              be set to the number of *bytes* in the file. Errors may occur if
              you open the file in *text mode*.
 
-.. _binary mode: https://docs.python.org/2/tutorial/inputoutput.html#reading-and-writing-files
+.. _binary mode: https://docs.python.org/3/tutorial/inputoutput.html#reading-and-writing-files
 
 
 .. _event-hooks:
@@ -436,7 +435,7 @@ You can assign a hook function on a per-request basis by passing a
 ``{hook_name: callback_function}`` dictionary to the ``hooks`` request
 parameter::
 
-    hooks=dict(response=print_url)
+    hooks={'response': print_url}
 
 That ``callback_function`` will receive a chunk of data as its first
 argument.
@@ -450,14 +449,38 @@ If an error occurs while executing your callback, a warning is given.
 
 If the callback function returns a value, it is assumed that it is to
 replace the data that was passed in. If the function doesn't return
-anything, nothing else is effected.
+anything, nothing else is affected.
+
+::
+
+    def record_hook(r, *args, **kwargs):
+        r.hook_called = True
+        return r
 
 Let's print some request method arguments at runtime::
 
-    >>> requests.get('http://httpbin.org', hooks=dict(response=print_url))
+    >>> requests.get('http://httpbin.org', hooks={'response': print_url})
     http://httpbin.org
     <Response [200]>
 
+You can add multiple hooks to a single request.  Let's call two hooks at once::
+
+    >>> r = requests.get('http://httpbin.org', hooks={'response': [print_url, record_hook]})
+    >>> r.hook_called
+    True
+
+You can also add hooks to a ``Session`` instance.  Any hooks you add will then
+be called on every request made to the session.  For example::
+
+   >>> s = requests.Session()
+   >>> s.hooks['response'].append(print_url)
+   >>> s.get('http://httpbin.org')
+    http://httpbin.org
+    <Response [200]>
+
+A ``Session`` can have multiple hooks, which will be called in the order
+they are added.
+
 .. _custom-auth:
 
 Custom Authentication
@@ -633,7 +656,7 @@ When you receive a response, Requests makes a guess at the encoding to
 use for decoding the response when you access the :attr:`Response.text
 <requests.Response.text>` attribute. Requests will first check for an
 encoding in the HTTP header, and if none is present, will use `chardet
-<http://pypi.python.org/pypi/chardet>`_ to attempt to guess the encoding.
+<https://pypi.org/project/chardet/>`_ to attempt to guess the encoding.
 
 The only time Requests will not do this is if no explicit charset
 is present in the HTTP headers **and** the ``Content-Type``
@@ -860,7 +883,7 @@ Link Headers
 Many HTTP APIs feature Link headers. They make APIs more self describing and
 discoverable.
 
-GitHub uses these for `pagination <http://developer.github.com/v3/#pagination>`_
+GitHub uses these for `pagination <https://developer.github.com/v3/#pagination>`_
 in their API, for example::
 
     >>> url = 'https://api.github.com/users/kennethreitz/repos?page=1&per_page=10'
@@ -927,9 +950,9 @@ passed-through to `urllib3`. We'll make a Transport Adapter that instructs the
 library to use SSLv3::
 
     import ssl
+    from urllib3.poolmanager import PoolManager
 
     from requests.adapters import HTTPAdapter
-    from requests.packages.urllib3.poolmanager import PoolManager
 
 
     class Ssl3HttpAdapter(HTTPAdapter):

docs/user/authentication.rst

@@ -136,11 +136,11 @@ Further examples can be found under the `Requests organization`_ and in the
 
 .. _OAuth: http://oauth.net/
 .. _requests_oauthlib: https://github.com/requests/requests-oauthlib
-.. _requests-oauthlib OAuth2 documentation: http://requests-oauthlib.readthedocs.io/en/latest/oauth2_workflow.html
-.. _Web Application Flow: http://requests-oauthlib.readthedocs.io/en/latest/oauth2_workflow.html#web-application-flow
-.. _Mobile Application Flow: http://requests-oauthlib.readthedocs.io/en/latest/oauth2_workflow.html#mobile-application-flow
-.. _Legacy Application Flow:  http://requests-oauthlib.readthedocs.io/en/latest/oauth2_workflow.html#legacy-application-flow
-.. _Backend Application Flow:  http://requests-oauthlib.readthedocs.io/en/latest/oauth2_workflow.html#backend-application-flow
+.. _requests-oauthlib OAuth2 documentation: https://requests-oauthlib.readthedocs.io/en/latest/oauth2_workflow.html
+.. _Web Application Flow: https://requests-oauthlib.readthedocs.io/en/latest/oauth2_workflow.html#web-application-flow
+.. _Mobile Application Flow: https://requests-oauthlib.readthedocs.io/en/latest/oauth2_workflow.html#mobile-application-flow
+.. _Legacy Application Flow: https://requests-oauthlib.readthedocs.io/en/latest/oauth2_workflow.html#legacy-application-flow
+.. _Backend Application Flow: https://requests-oauthlib.readthedocs.io/en/latest/oauth2_workflow.html#backend-application-flow
 .. _Kerberos: https://github.com/requests/requests-kerberos
 .. _NTLM: https://github.com/requests/requests-ntlm
 .. _Requests organization: https://github.com/requests

docs/user/quickstart.rst

@@ -110,7 +110,7 @@ using, and change it, using the ``r.encoding`` property::
 If you change the encoding, Requests will use the new value of ``r.encoding``
 whenever you call ``r.text``. You might want to do this in any situation where
 you can apply special logic to work out what the encoding of the content will
-be. For example, HTTP and XML have the ability to specify their encoding in
+be. For example, HTML and XML have the ability to specify their encoding in
 their body. In situations like this, you should use ``r.content`` to find the
 encoding, and then set ``r.encoding``. This will let you use ``r.text`` with
 the correct encoding.
@@ -171,7 +171,7 @@ server, you can access ``r.raw``. If you want to do this, make sure you set
     >>> r = requests.get('https://api.github.com/events', stream=True)
 
     >>> r.raw
-    <requests.packages.urllib3.response.HTTPResponse object at 0x101194810>
+    <urllib3.response.HTTPResponse object at 0x101194810>
 
     >>> r.raw.read(10)
     '\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\x03'
@@ -189,6 +189,14 @@ download, the above is the preferred and recommended way to retrieve the
 content. Note that ``chunk_size`` can be freely adjusted to a number that
 may better fit your use cases.
 
+.. note::
+
+   An important note about using ``Response.iter_content`` versus ``Response.raw``.
+   ``Response.iter_content`` will automatically decode the ``gzip`` and ``deflate``
+   transfer-encodings.  ``Response.raw`` is a raw stream of bytes -- it does not
+   transform the response content.  If you really need access to the bytes as they
+   were returned, use ``Response.raw``.
+
 
 Custom Headers
 --------------
@@ -273,6 +281,9 @@ the ``json`` parameter (added in version 2.4.2) and it will be encoded automatic
 
     >>> r = requests.post(url, json=payload)
 
+Note, the ``json`` parameter is ignored if either ``data`` or ``files`` is passed.
+
+Using the ``json`` parameter in the request will change the ``Content-Type`` in the header to ``application/json``.
 
 POST a Multipart-Encoded File
 -----------------------------
@@ -337,7 +348,7 @@ section.
              be set to the number of *bytes* in the file. Errors may occur if
              you open the file in *text mode*.
 
-.. _binary mode: https://docs.python.org/2/tutorial/inputoutput.html#reading-and-writing-files
+.. _binary mode: https://docs.python.org/3/tutorial/inputoutput.html#reading-and-writing-files
 
 
 Response Status Codes
@@ -373,14 +384,10 @@ But, since our ``status_code`` for ``r`` was ``200``, when we call
 ``raise_for_status()`` we get::
 
     >>> r.raise_for_status()
-    <Response [200]>
+    None
 
 All is well.
 
-.. note:: ``raise_for_status`` returns the response object for a successful response. This eases chaining in trivial cases, where we want bad codes to raise an exception, but use the response otherwise:
-
-    >>> value = requests.get('http://httpbin.org/ip').raise_for_status().json()['origin']
-
 
 Response Headers
 ----------------
@@ -420,10 +427,6 @@ represented in the dictionary within a single mapping, as per
     of the message, by appending each subsequent field value to the combined
     field value in order, separated by a comma.
 
-If you do need to access each individual value sent with the same header, then
-you can use the ``getlist`` method to get a sequence of all the values returned
-for a particular header.
-
 Cookies
 -------
 

requests/__init__.py

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
+
 #   __
 #  /__)  _  _     _   _ _/   _
 # / (   (- (/ (/ (- _)  /  _)
 #          /
+
 """
 Requests HTTP Library
 ~~~~~~~~~~~~~~~~~~~~~
@@ -42,99 +44,93 @@ import urllib3
 import chardet
 import warnings
 from .exceptions import RequestsDependencyWarning
-from .import types
 
 
-def check_compatibility(urllib3_version: types.String, chardet_version: types.String) -> None:
-    urllib3_version = urllib3_version.split('.')  # type: ignore
-    assert urllib3_version != [
-        'dev'
-    ]  # Verify urllib3 isn't installed from git.
+def check_compatibility(urllib3_version, chardet_version):
+    urllib3_version = urllib3_version.split('.')
+    assert urllib3_version != ['dev']  # Verify urllib3 isn't installed from git.
+
     # Sometimes, urllib3 only reports its version as 16.1.
     if len(urllib3_version) == 2:
-        urllib3_version.append('0')  # type: ignore
+        urllib3_version.append('0')
+
     # Check urllib3 for compatibility.
     major, minor, patch = urllib3_version  # noqa: F811
-    major, minor, patch = int(major), int(minor), int(patch)  # type: ignore
-    # urllib3 >= 1.21.1, <= 1.22
-    assert major == 1  # type: ignore
-    assert minor >= 21  # type: ignore
-    assert minor <= 22  # type: ignore
+    major, minor, patch = int(major), int(minor), int(patch)
+    # urllib3 >= 1.21.1, <= 1.23
+    assert major == 1
+    assert minor >= 21
+    assert minor <= 23
+
     # Check chardet for compatibility.
     major, minor, patch = chardet_version.split('.')[:3]
-    major, minor, patch = int(major), int(minor), int(patch)  # type: ignore
+    major, minor, patch = int(major), int(minor), int(patch)
     # chardet >= 3.0.2, < 3.1.0
-    assert major == 3  # type: ignore
-    assert minor < 1  # type: ignore
-    assert patch >= 2  # type: ignore
+    assert major == 3
+    assert minor < 1
+    assert patch >= 2
 
 
-def _check_cryptography(cryptography_version: types.String) -> None:
+def _check_cryptography(cryptography_version):
     # cryptography < 1.3.4
     try:
-        cryptography_version = list(
-            map(int, cryptography_version.split('.'))
-        )  # type: ignore
+        cryptography_version = list(map(int, cryptography_version.split('.')))
     except ValueError:
         return
 
-    if cryptography_version < [1, 3, 4]:  # type: ignore
-        warning = 'Old version of cryptography ({0}) may cause slowdown.'.format(
-            cryptography_version
-        )
+    if cryptography_version < [1, 3, 4]:
+        warning = 'Old version of cryptography ({0}) may cause slowdown.'.format(cryptography_version)
         warnings.warn(warning, RequestsDependencyWarning)
 
-
 # Check imported dependencies for compatibility.
 try:
     check_compatibility(urllib3.__version__, chardet.__version__)
 except (AssertionError, ValueError):
-    warnings.warn(
-        "urllib3 ({0}) or chardet ({1}) doesn't match a supported "
-        "version!".format(urllib3.__version__, chardet.__version__),
-        RequestsDependencyWarning,
-    )
+    warnings.warn("urllib3 ({0}) or chardet ({1}) doesn't match a supported "
+                  "version!".format(urllib3.__version__, chardet.__version__),
+                  RequestsDependencyWarning)
+
 # Attempt to enable urllib3's SNI support, if possible
 try:
     from urllib3.contrib import pyopenssl
-
     pyopenssl.inject_into_urllib3()
+
     # Check cryptography version
     from cryptography import __version__ as cryptography_version
-
     _check_cryptography(cryptography_version)
 except ImportError:
     pass
+
 # urllib3's DependencyWarnings should be silenced.
 from urllib3.exceptions import DependencyWarning
-
 warnings.simplefilter('ignore', DependencyWarning)
 
 from .__version__ import __title__, __description__, __url__, __version__
 from .__version__ import __build__, __author__, __author_email__, __license__
 from .__version__ import __copyright__, __cake__
 
-from .import utils
+from . import utils
+from . import packages
 from .models import Request, Response, PreparedRequest
 from .api import request, get, head, post, patch, put, delete, options
-from .sessions import Session
+from .sessions import session, Session
 from .status_codes import codes
 from .exceptions import (
-    RequestException,
-    Timeout,
-    URLRequired,
-    TooManyRedirects,
-    HTTPError,
-    ConnectionError,
-    FileModeWarning,
-    ConnectTimeout,
-    ReadTimeout,
+    RequestException, Timeout, URLRequired,
+    TooManyRedirects, HTTPError, ConnectionError,
+    FileModeWarning, ConnectTimeout, ReadTimeout
 )
 
 # Set default logging handler to avoid "No handler found" warnings.
 import logging
-from logging import NullHandler
+try:  # Python 2.7+
+    from logging import NullHandler
+except ImportError:
+    class NullHandler(logging.Handler):
+        def emit(self, record):
+            pass
 
 logging.getLogger(__name__).addHandler(NullHandler())
+
 # FileModeWarnings go off per the default.
 warnings.simplefilter('default', FileModeWarning, append=True)

requests/__version__.py

@@ -1,13 +1,14 @@
 # .-. .-. .-. . . .-. .-. .-. .-.
 # |(  |-  |.| | | |-  `-.  |  `-.
 # ' ' `-' `-`.`-' `-' `-'  '  `-'
+
 __title__ = 'requests'
 __description__ = 'Python HTTP for Humans.'
 __url__ = 'http://python-requests.org'
-__version__ = '3.0.0'
-__build__ = 0x030000
+__version__ = '2.19.0'
+__build__ = 0x021900
 __author__ = 'Kenneth Reitz'
 __author_email__ = 'me@kennethreitz.org'
 __license__ = 'Apache 2.0'
-__copyright__ = 'Copyright 2017 Kenneth Reitz'
+__copyright__ = 'Copyright 2018 Kenneth Reitz'
 __cake__ = u'\u2728 \U0001f370 \u2728'

requests/_internal_utils.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 """
 requests._internal_utils
 ~~~~~~~~~~~~~~
@@ -7,7 +8,7 @@ Provides utility functions that are consumed internally by Requests
 which depend on extremely few external helpers (such as compat)
 """
 
-from .basics import builtin_str, str
+from .compat import is_py2, builtin_str, str
 
 
 def to_native_string(string, encoding='ascii'):
@@ -18,7 +19,11 @@ def to_native_string(string, encoding='ascii'):
     if isinstance(string, builtin_str):
         out = string
     else:
-        out = string.decode(encoding)
+        if is_py2:
+            out = string.encode(encoding)
+        else:
+            out = string.decode(encoding)
+
     return out
 
 
@@ -29,12 +34,9 @@ def unicode_is_ascii(u_string):
         and not Python 2 `str`.
     :rtype: bool
     """
-    if not isinstance(u_string, str):
-        return None
-
+    assert isinstance(u_string, str)
     try:
         u_string.encode('ascii')
         return True
-
     except UnicodeEncodeError:
         return False

requests/adapters.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 """
 requests.adapters
 ~~~~~~~~~~~~~~~~~
@@ -12,6 +13,7 @@ import socket
 
 from urllib3.poolmanager import PoolManager, proxy_from_url
 from urllib3.response import HTTPResponse
+from urllib3.util import parse_url
 from urllib3.util import Timeout as TimeoutSauce
 from urllib3.util.retry import Retry
 from urllib3.exceptions import ClosedPoolError
@@ -26,35 +28,21 @@ from urllib3.exceptions import SSLError as _SSLError
 from urllib3.exceptions import ResponseError
 
 from .models import Response
-from .basics import urlparse, basestring
-from .utils import (
-    DEFAULT_CA_BUNDLE_PATH,
-    get_encoding_from_headers,
-    prepend_scheme_if_needed,
-    get_auth_from_url,
-    urldefragauth,
-    select_proxy,
-)
-from .structures import HTTPHeaderDict
+from .compat import urlparse, basestring
+from .utils import (DEFAULT_CA_BUNDLE_PATH, extract_zipped_paths,
+                    get_encoding_from_headers, prepend_scheme_if_needed,
+                    get_auth_from_url, urldefragauth, select_proxy)
+from .structures import CaseInsensitiveDict
 from .cookies import extract_cookies_to_jar
-from .exceptions import (
-    ConnectionError,
-    ConnectTimeout,
-    ReadTimeout,
-    SSLError,
-    ProxyError,
-    RetryError,
-    InvalidScheme,
-)
+from .exceptions import (ConnectionError, ConnectTimeout, ReadTimeout, SSLError,
+                         ProxyError, RetryError, InvalidSchema, InvalidProxyURL)
 from .auth import _basic_auth_str
 
 try:
     from urllib3.contrib.socks import SOCKSProxyManager
 except ImportError:
-
     def SOCKSProxyManager(*args, **kwargs):
-        raise InvalidScheme("Missing dependencies for SOCKS support.")
-
+        raise InvalidSchema("Missing dependencies for SOCKS support.")
 
 DEFAULT_POOLBLOCK = False
 DEFAULT_POOLSIZE = 10
@@ -62,83 +50,14 @@ DEFAULT_RETRIES = 0
 DEFAULT_POOL_TIMEOUT = None
 
 
-def _pool_kwargs(verify, cert):
-    """Create a dictionary of keyword arguments to pass to a
-    :class:`PoolManager <urllib3.poolmanager.PoolManager>` with the
-    necessary SSL configuration.
-
-    :param verify: Whether we should actually verify the certificate;
-                   optionally a path to a CA certificate bundle or
-                   directory of CA certificates.
-    :param cert: The path to the client certificate and key, if any.
-                 This can either be the path to the certificate and
-                 key concatenated in a single file, or as a tuple of
-                 (cert_file, key_file).
-    """
-    pool_kwargs = {}
-    if verify:
-        cert_loc = None
-        # Allow self-specified cert location.
-        if verify is not True:
-            cert_loc = verify
-        if not cert_loc:
-            cert_loc = DEFAULT_CA_BUNDLE_PATH
-        if not cert_loc or not os.path.exists(cert_loc):
-            raise IOError(
-                "Could not find a suitable TLS CA certificate bundle, "
-                "invalid path: {0}".format(cert_loc)
-            )
-
-        pool_kwargs['cert_reqs'] = 'CERT_REQUIRED'
-        if not os.path.isdir(cert_loc):
-            pool_kwargs['ca_certs'] = cert_loc
-            pool_kwargs['ca_cert_dir'] = None
-        else:
-            pool_kwargs['ca_cert_dir'] = cert_loc
-            pool_kwargs['ca_certs'] = None
-    else:
-        pool_kwargs['cert_reqs'] = 'CERT_NONE'
-        pool_kwargs['ca_certs'] = None
-        pool_kwargs['ca_cert_dir'] = None
-    if cert:
-        if not isinstance(cert, basestring):
-            pool_kwargs['cert_file'] = cert[0]
-            pool_kwargs['key_file'] = cert[1]
-        else:
-            pool_kwargs['cert_file'] = cert
-            pool_kwargs['key_file'] = None
-        cert_file = pool_kwargs['cert_file']
-        key_file = pool_kwargs['key_file']
-        if cert_file and not os.path.exists(cert_file):
-            raise IOError(
-                "Could not find the TLS certificate file, "
-                "invalid path: {0}".format(cert_file)
-            )
-
-        if key_file and not os.path.exists(key_file):
-            raise IOError(
-                "Could not find the TLS key file, "
-                "invalid path: {0}".format(key_file)
-            )
-
-    return pool_kwargs
-
-
 class BaseAdapter(object):
     """The Base Transport Adapter"""
 
     def __init__(self):
         super(BaseAdapter, self).__init__()
 
-    def send(
-        self,
-        request,
-        stream=False,
-        timeout=None,
-        verify=True,
-        cert=None,
-        proxies=None,
-    ):
+    def send(self, request, stream=False, timeout=None, verify=True,
+             cert=None, proxies=None):
         """Sends PreparedRequest object. Returns Response object.
 
         :param request: The :class:`PreparedRequest <PreparedRequest>` being sent.
@@ -186,50 +105,44 @@ class HTTPAdapter(BaseAdapter):
       >>> a = requests.adapters.HTTPAdapter(max_retries=3)
       >>> s.mount('http://', a)
     """
-    __attrs__ = [
-        'max_retries',
-        'config',
-        '_pool_connections',
-        '_pool_maxsize',
-        '_pool_block',
-    ]
+    __attrs__ = ['max_retries', 'config', '_pool_connections', '_pool_maxsize',
+                 '_pool_block']
 
-    def __init__(
-        self,
-        pool_connections=DEFAULT_POOLSIZE,
-        pool_maxsize=DEFAULT_POOLSIZE,
-        max_retries=DEFAULT_RETRIES,
-        pool_block=DEFAULT_POOLBLOCK,
-    ):
+    def __init__(self, pool_connections=DEFAULT_POOLSIZE,
+                 pool_maxsize=DEFAULT_POOLSIZE, max_retries=DEFAULT_RETRIES,
+                 pool_block=DEFAULT_POOLBLOCK):
         if max_retries == DEFAULT_RETRIES:
             self.max_retries = Retry(0, read=False)
         else:
             self.max_retries = Retry.from_int(max_retries)
         self.config = {}
         self.proxy_manager = {}
+
         super(HTTPAdapter, self).__init__()
+
         self._pool_connections = pool_connections
         self._pool_maxsize = pool_maxsize
         self._pool_block = pool_block
+
         self.init_poolmanager(pool_connections, pool_maxsize, block=pool_block)
 
     def __getstate__(self):
-        return {attr: getattr(self, attr, None) for attr in self.__attrs__}
+        return dict((attr, getattr(self, attr, None)) for attr in
+                    self.__attrs__)
 
     def __setstate__(self, state):
         # Can't handle by adding 'proxy_manager' to self.__attrs__ because
         # self.poolmanager uses a lambda function, which isn't pickleable.
         self.proxy_manager = {}
         self.config = {}
+
         for attr, value in state.items():
             setattr(self, attr, value)
-        self.init_poolmanager(
-            self._pool_connections, self._pool_maxsize, block=self._pool_block
-        )
 
-    def init_poolmanager(
-        self, connections, maxsize, block=DEFAULT_POOLBLOCK, **pool_kwargs
-    ):
+        self.init_poolmanager(self._pool_connections, self._pool_maxsize,
+                              block=self._pool_block)
+
+    def init_poolmanager(self, connections, maxsize, block=DEFAULT_POOLBLOCK, **pool_kwargs):
         """Initializes a urllib3 PoolManager.
 
         This method should not be called from user code, and is only
@@ -245,13 +158,9 @@ class HTTPAdapter(BaseAdapter):
         self._pool_connections = connections
         self._pool_maxsize = maxsize
         self._pool_block = block
-        self.poolmanager = PoolManager(
-            num_pools=connections,
-            maxsize=maxsize,
-            block=block,
-            strict=True,
-            **pool_kwargs,
-        )
+
+        self.poolmanager = PoolManager(num_pools=connections, maxsize=maxsize,
+                                       block=block, strict=True, **pool_kwargs)
 
     def proxy_manager_for(self, proxy, **proxy_kwargs):
         """Return urllib3 ProxyManager for the given proxy.
@@ -276,7 +185,7 @@ class HTTPAdapter(BaseAdapter):
                 num_pools=self._pool_connections,
                 maxsize=self._pool_maxsize,
                 block=self._pool_block,
-                **proxy_kwargs,
+                **proxy_kwargs
             )
         else:
             proxy_headers = self.proxy_headers(proxy)
@@ -286,10 +195,62 @@ class HTTPAdapter(BaseAdapter):
                 num_pools=self._pool_connections,
                 maxsize=self._pool_maxsize,
                 block=self._pool_block,
-                **proxy_kwargs,
-            )
+                **proxy_kwargs)
+
         return manager
 
+    def cert_verify(self, conn, url, verify, cert):
+        """Verify a SSL certificate. This method should not be called from user
+        code, and is only exposed for use when subclassing the
+        :class:`HTTPAdapter <requests.adapters.HTTPAdapter>`.
+
+        :param conn: The urllib3 connection object associated with the cert.
+        :param url: The requested URL.
+        :param verify: Either a boolean, in which case it controls whether we verify
+            the server's TLS certificate, or a string, in which case it must be a path
+            to a CA bundle to use
+        :param cert: The SSL certificate to verify.
+        """
+        if url.lower().startswith('https') and verify:
+
+            cert_loc = None
+
+            # Allow self-specified cert location.
+            if verify is not True:
+                cert_loc = verify
+
+            if not cert_loc:
+                cert_loc = extract_zipped_paths(DEFAULT_CA_BUNDLE_PATH)
+
+            if not cert_loc or not os.path.exists(cert_loc):
+                raise IOError("Could not find a suitable TLS CA certificate bundle, "
+                              "invalid path: {0}".format(cert_loc))
+
+            conn.cert_reqs = 'CERT_REQUIRED'
+
+            if not os.path.isdir(cert_loc):
+                conn.ca_certs = cert_loc
+            else:
+                conn.ca_cert_dir = cert_loc
+        else:
+            conn.cert_reqs = 'CERT_NONE'
+            conn.ca_certs = None
+            conn.ca_cert_dir = None
+
+        if cert:
+            if not isinstance(cert, basestring):
+                conn.cert_file = cert[0]
+                conn.key_file = cert[1]
+            else:
+                conn.cert_file = cert
+                conn.key_file = None
+            if conn.cert_file and not os.path.exists(conn.cert_file):
+                raise IOError("Could not find the TLS certificate file, "
+                              "invalid path: {0}".format(conn.cert_file))
+            if conn.key_file and not os.path.exists(conn.key_file):
+                raise IOError("Could not find the TLS key file, "
+                              "invalid path: {0}".format(conn.key_file))
+
     def build_response(self, req, resp):
         """Builds a :class:`Response <requests.Response>` object from a urllib3
         response. This should not be called from user code, and is only exposed
@@ -301,26 +262,33 @@ class HTTPAdapter(BaseAdapter):
         :rtype: requests.Response
         """
         response = Response()
+
         # Fallback to None if there's no status_code, for whatever reason.
         response.status_code = getattr(resp, 'status', None)
+
         # Make headers case-insensitive.
-        response.headers = HTTPHeaderDict(getattr(resp, 'headers', {}))
+        response.headers = CaseInsensitiveDict(getattr(resp, 'headers', {}))
+
         # Set encoding.
         response.encoding = get_encoding_from_headers(response.headers)
         response.raw = resp
         response.reason = response.raw.reason
+
         if isinstance(req.url, bytes):
             response.url = req.url.decode('utf-8')
         else:
             response.url = req.url
+
         # Add new cookies from the server.
         extract_cookies_to_jar(response.cookies, req, resp)
+
         # Give the Response some context.
         response.request = req
         response.connection = self
+
         return response
 
-    def get_connection(self, url, proxies=None, verify=None, cert=None):
+    def get_connection(self, url, proxies=None):
         """Returns a urllib3 connection for the given URL. This should not be
         called from user code, and is only exposed for use when subclassing the
         :class:`HTTPAdapter <requests.adapters.HTTPAdapter>`.
@@ -329,21 +297,22 @@ class HTTPAdapter(BaseAdapter):
         :param proxies: (optional) A Requests-style dictionary of proxies used on this request.
         :rtype: urllib3.ConnectionPool
         """
-        pool_kwargs = _pool_kwargs(verify, cert)
         proxy = select_proxy(url, proxies)
+
         if proxy:
             proxy = prepend_scheme_if_needed(proxy, 'http')
+            proxy_url = parse_url(proxy)
+            if not proxy_url.host:
+                raise InvalidProxyURL("Please check proxy URL. It is malformed"
+                                      " and could be missing the host.")
             proxy_manager = self.proxy_manager_for(proxy)
-            conn = proxy_manager.connection_from_url(
-                url, pool_kwargs=pool_kwargs
-            )
+            conn = proxy_manager.connection_from_url(url)
         else:
             # Only scheme should be lower case
             parsed = urlparse(url)
             url = parsed.geturl()
-            conn = self.poolmanager.connection_from_url(
-                url, pool_kwargs=pool_kwargs
-            )
+            conn = self.poolmanager.connection_from_url(url)
+
         return conn
 
     def close(self):
@@ -372,14 +341,17 @@ class HTTPAdapter(BaseAdapter):
         """
         proxy = select_proxy(request.url, proxies)
         scheme = urlparse(request.url).scheme
+
         is_proxied_http_request = (proxy and scheme != 'https')
         using_socks_proxy = False
         if proxy:
             proxy_scheme = urlparse(proxy).scheme.lower()
             using_socks_proxy = proxy_scheme.startswith('socks')
+
         url = request.path_url
         if is_proxied_http_request and not using_socks_proxy:
             url = urldefragauth(request.url)
+
         return url
 
     def add_headers(self, request, **kwargs):
@@ -411,21 +383,14 @@ class HTTPAdapter(BaseAdapter):
         """
         headers = {}
         username, password = get_auth_from_url(proxy)
+
         if username:
-            headers['Proxy-Authorization'] = _basic_auth_str(
-                username, password
-            )
+            headers['Proxy-Authorization'] = _basic_auth_str(username,
+                                                             password)
+
         return headers
 
-    def send(
-        self,
-        request,
-        stream=False,
-        timeout=None,
-        verify=True,
-        cert=None,
-        proxies=None,
-    ):
+    def send(self, request, stream=False, timeout=None, verify=True, cert=None, proxies=None):
         """Sends PreparedRequest object. Returns Response object.
 
         :param request: The :class:`PreparedRequest <PreparedRequest>` being sent.
@@ -441,29 +406,30 @@ class HTTPAdapter(BaseAdapter):
         :param proxies: (optional) The proxies dictionary to apply to the request.
         :rtype: requests.Response
         """
-        conn = self.get_connection(request.url, proxies, verify, cert)
+
+        conn = self.get_connection(request.url, proxies)
+
+        self.cert_verify(conn, request.url, verify, cert)
         url = self.request_url(request, proxies)
-        self.add_headers(request)
-        chunked = not (
-            request.body is None or 'Content-Length' in request.headers
-        )
+        self.add_headers(request, stream=stream, timeout=timeout, verify=verify, cert=cert, proxies=proxies)
+
+        chunked = not (request.body is None or 'Content-Length' in request.headers)
+
         if isinstance(timeout, tuple):
             try:
                 connect, read = timeout
                 timeout = TimeoutSauce(connect=connect, read=read)
             except ValueError as e:
                 # this may raise a string formatting error.
-                err = (
-                    "Invalid timeout {0}. Pass a (connect, read) "
-                    "timeout tuple, or a single float to set "
-                    "both timeouts to the same value".format(timeout)
-                )
+                err = ("Invalid timeout {0}. Pass a (connect, read) "
+                       "timeout tuple, or a single float to set "
+                       "both timeouts to the same value".format(timeout))
                 raise ValueError(err)
-
         elif isinstance(timeout, TimeoutSauce):
             pass
         else:
             timeout = TimeoutSauce(connect=timeout, read=timeout)
+
         try:
             if not chunked:
                 resp = conn.urlopen(
@@ -476,46 +442,48 @@ class HTTPAdapter(BaseAdapter):
                     preload_content=False,
                     decode_content=False,
                     retries=self.max_retries,
-                    timeout=timeout,
-                    enforce_content_length=True,
+                    timeout=timeout
                 )
+
             # Send the request.
             else:
                 if hasattr(conn, 'proxy_pool'):
                     conn = conn.proxy_pool
+
                 low_conn = conn._get_conn(timeout=DEFAULT_POOL_TIMEOUT)
+
                 try:
-                    low_conn.putrequest(
-                        request.method, url, skip_accept_encoding=True
-                    )
+                    low_conn.putrequest(request.method,
+                                        url,
+                                        skip_accept_encoding=True)
+
                     for header, value in request.headers.items():
                         low_conn.putheader(header, value)
-                    low_conn.endheaders()
-                    for i in request.body:
-                        chunk_size = len(i)
-                        if chunk_size == 0:
-                            continue
 
-                        low_conn.send(hex(chunk_size)[2:].encode('utf-8'))
+                    low_conn.endheaders()
+
+                    for i in request.body:
+                        low_conn.send(hex(len(i))[2:].encode('utf-8'))
                         low_conn.send(b'\r\n')
                         low_conn.send(i)
                         low_conn.send(b'\r\n')
                     low_conn.send(b'0\r\n\r\n')
+
                     # Receive the response from the server
                     try:
-                        # For Python 2.7, use buffering of HTTP responses
+                        # For Python 2.7+ versions, use buffering of HTTP
+                        # responses
                         r = low_conn.getresponse(buffering=True)
                     except TypeError:
-                        # For Python 3.3+ versions, this is the default
+                        # For compatibility with Python 2.6 versions and back
                         r = low_conn.getresponse()
+
                     resp = HTTPResponse.from_httplib(
                         r,
                         pool=conn,
                         connection=low_conn,
                         preload_content=False,
-                        decode_content=False,
-                        enforce_content_length=True,
-                        request_method=request.method,
+                        decode_content=False
                     )
                 except:
                     # If we hit any problems here, clean up the connection.
@@ -554,10 +522,8 @@ class HTTPAdapter(BaseAdapter):
             if isinstance(e, _SSLError):
                 # This branch is for urllib3 versions earlier than v1.22
                 raise SSLError(e, request=request)
-
             elif isinstance(e, ReadTimeoutError):
                 raise ReadTimeout(e, request=request)
-
             else:
                 raise
 

requests/api.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 """
 requests.api
 ~~~~~~~~~~~~
@@ -9,25 +10,17 @@ This module implements the Requests API.
 :license: Apache2, see LICENSE for more details.
 """
 
-from .import sessions
-from .import types
+from . import sessions
 
 
-def request(
-    method: types.Method,
-    url: types.URL,
-    *,
-    session: types.Session = None,
-    **kwargs,
-) -> types.Response:
+def request(method, url, **kwargs):
     """Constructs and sends a :class:`Request <Request>`.
 
     :param method: method for the new :class:`Request` object.
     :param url: URL for the new :class:`Request` object.
-    :param session: :class:`Session` object to use for this request. If none is given, one will be provided.
     :param params: (optional) Dictionary or bytes to be sent in the query string for the :class:`Request`.
     :param data: (optional) Dictionary or list of tuples ``[(key, value)]`` (will be form-encoded), bytes, or file-like object to send in the body of the :class:`Request`.
-    :param json: (optional) json data to send in the body of the :class:`Request`.
+    :param json: (optional) A JSON serializable Python object to send in the body of the :class:`Request`.
     :param headers: (optional) Dictionary of HTTP Headers to send with the :class:`Request`.
     :param cookies: (optional) Dict or CookieJar object to send with the :class:`Request`.
     :param files: (optional) Dictionary of ``'name': file-like-objects`` (or ``{'name': file-tuple}``) for multipart encoding upload.
@@ -57,17 +50,15 @@ def request(
       >>> req = requests.request('GET', 'http://httpbin.org/get')
       <Response [200]>
     """
+
     # By using the 'with' statement we are sure the session is closed, thus we
     # avoid leaving sockets open which can trigger a ResourceWarning in some
     # cases, and look like a memory leak in others.
-    session = sessions.Session() if session is None else session
-    with session:
+    with sessions.Session() as session:
         return session.request(method=method, url=url, **kwargs)
 
 
-def get(
-    url: types.URL, *, params: types.Params = None, **kwargs
-) -> types.Response:
+def get(url, params=None, **kwargs):
     r"""Sends a GET request.
 
     :param url: URL for the new :class:`Request` object.
@@ -76,11 +67,12 @@ def get(
     :return: :class:`Response <Response>` object
     :rtype: requests.Response
     """
+
     kwargs.setdefault('allow_redirects', True)
     return request('get', url, params=params, **kwargs)
 
 
-def options(url: types.URL, **kwargs) -> types.Response:
+def options(url, **kwargs):
     r"""Sends an OPTIONS request.
 
     :param url: URL for the new :class:`Request` object.
@@ -88,11 +80,12 @@ def options(url: types.URL, **kwargs) -> types.Response:
     :return: :class:`Response <Response>` object
     :rtype: requests.Response
     """
+
     kwargs.setdefault('allow_redirects', True)
     return request('options', url, **kwargs)
 
 
-def head(url: types.URL, **kwargs) -> types.Response:
+def head(url, **kwargs):
     r"""Sends a HEAD request.
 
     :param url: URL for the new :class:`Request` object.
@@ -100,17 +93,12 @@ def head(url: types.URL, **kwargs) -> types.Response:
     :return: :class:`Response <Response>` object
     :rtype: requests.Response
     """
+
     kwargs.setdefault('allow_redirects', False)
     return request('head', url, **kwargs)
 
 
-def post(
-    url: types.URL,
-    *,
-    data: types.Data = None,
-    json: types.JSON = None,
-    **kwargs,
-) -> types.Response:
+def post(url, data=None, json=None, **kwargs):
     r"""Sends a POST request.
 
     :param url: URL for the new :class:`Request` object.
@@ -120,12 +108,11 @@ def post(
     :return: :class:`Response <Response>` object
     :rtype: requests.Response
     """
+
     return request('post', url, data=data, json=json, **kwargs)
 
 
-def put(
-    url: types.URL, *, data: types.Data = None, **kwargs
-) -> types.Response:
+def put(url, data=None, **kwargs):
     r"""Sends a PUT request.
 
     :param url: URL for the new :class:`Request` object.
@@ -135,12 +122,11 @@ def put(
     :return: :class:`Response <Response>` object
     :rtype: requests.Response
     """
+
     return request('put', url, data=data, **kwargs)
 
 
-def patch(
-    url: types.URL, *, data: types.Data = None, **kwargs
-) -> types.Response:
+def patch(url, data=None, **kwargs):
     r"""Sends a PATCH request.
 
     :param url: URL for the new :class:`Request` object.
@@ -150,10 +136,11 @@ def patch(
     :return: :class:`Response <Response>` object
     :rtype: requests.Response
     """
+
     return request('patch', url, data=data, **kwargs)
 
 
-def delete(url: types.URL, **kwargs) -> types.Response:
+def delete(url, **kwargs):
     r"""Sends a DELETE request.
 
     :param url: URL for the new :class:`Request` object.
@@ -161,4 +148,5 @@ def delete(url: types.URL, **kwargs) -> types.Response:
     :return: :class:`Response <Response>` object
     :rtype: requests.Response
     """
+
     return request('delete', url, **kwargs)

requests/auth.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 """
 requests.auth
 ~~~~~~~~~~~~~
@@ -11,10 +12,11 @@ import re
 import time
 import hashlib
 import threading
+import warnings
 
 from base64 import b64encode
 
-from .basics import urlparse, str, basestring
+from .compat import urlparse, str, basestring
 from .cookies import extract_cookies_to_jar
 from ._internal_utils import to_native_string
 from .utils import parse_dict_header
@@ -25,25 +27,45 @@ CONTENT_TYPE_MULTI_PART = 'multipart/form-data'
 
 def _basic_auth_str(username, password):
     """Returns a Basic Auth string."""
+
+    # "I want us to put a big-ol' comment on top of it that
+    # says that this behaviour is dumb but we need to preserve
+    # it because people are relying on it."
+    #    - Lukasa
+    #
+    # These are here solely to maintain backwards compatibility
+    # for things like ints. This will be removed in 3.0.0.
     if not isinstance(username, basestring):
-        raise TypeError(
-            'username must be of type str or bytes, '
-            'instead it was %s' % type(username)
+        warnings.warn(
+            "Non-string usernames will no longer be supported in Requests "
+            "3.0.0. Please convert the object you've passed in ({0!r}) to "
+            "a string or bytes object in the near future to avoid "
+            "problems.".format(username),
+            category=DeprecationWarning,
         )
+        username = str(username)
 
     if not isinstance(password, basestring):
-        raise TypeError(
-            'password must be of type str or bytes, '
-            'instead it was %s' % type(password)
+        warnings.warn(
+            "Non-string passwords will no longer be supported in Requests "
+            "3.0.0. Please convert the object you've passed in ({0!r}) to "
+            "a string or bytes object in the near future to avoid "
+            "problems.".format(password),
+            category=DeprecationWarning,
         )
+        password = str(password)
+    # -- End Removal --
 
     if isinstance(username, str):
         username = username.encode('latin1')
+
     if isinstance(password, str):
         password = password.encode('latin1')
+
     authstr = 'Basic ' + to_native_string(
         b64encode(b':'.join((username, password))).strip()
     )
+
     return authstr
 
 
@@ -62,20 +84,24 @@ class HTTPBasicAuth(AuthBase):
         self.password = password
 
     def __eq__(self, other):
-        return all(
-            [
-                self.username == getattr(other, 'username', None),
-                self.password == getattr(other, 'password', None),
-            ]
-        )
+        return all([
+            self.username == getattr(other, 'username', None),
+            self.password == getattr(other, 'password', None)
+        ])
 
     def __ne__(self, other):
         return not self == other
 
     def __call__(self, r):
-        r.headers['Authorization'] = _basic_auth_str(
-            self.username, self.password
-        )
+        r.headers['Authorization'] = _basic_auth_str(self.username, self.password)
+        return r
+
+
+class HTTPProxyAuth(HTTPBasicAuth):
+    """Attaches HTTP Proxy Authentication to a given Request object."""
+
+    def __call__(self, r):
+        r.headers['Proxy-Authorization'] = _basic_auth_str(self.username, self.password)
         return r
 
 
@@ -102,48 +128,63 @@ class HTTPDigestAuth(AuthBase):
         """
         :rtype: str
         """
+
         realm = self._thread_local.chal['realm']
         nonce = self._thread_local.chal['nonce']
         qop = self._thread_local.chal.get('qop')
         algorithm = self._thread_local.chal.get('algorithm')
         opaque = self._thread_local.chal.get('opaque')
         hash_utf8 = None
+
         if algorithm is None:
             _algorithm = 'MD5'
         else:
             _algorithm = algorithm.upper()
         # lambdas assume digest modules are imported at the top level
         if _algorithm == 'MD5' or _algorithm == 'MD5-SESS':
-
             def md5_utf8(x):
                 if isinstance(x, str):
                     x = x.encode('utf-8')
                 return hashlib.md5(x).hexdigest()
-
             hash_utf8 = md5_utf8
         elif _algorithm == 'SHA':
-
             def sha_utf8(x):
                 if isinstance(x, str):
                     x = x.encode('utf-8')
                 return hashlib.sha1(x).hexdigest()
-
             hash_utf8 = sha_utf8
+        elif _algorithm == 'SHA-256':
+            def sha256_utf8(x):
+                if isinstance(x, str):
+                    x = x.encode('utf-8')
+                return hashlib.sha256(x).hexdigest()
+            hash_utf8 = sha256_utf8
+        elif _algorithm == 'SHA-512':
+            def sha512_utf8(x):
+                if isinstance(x, str):
+                    x = x.encode('utf-8')
+                return hashlib.sha512(x).hexdigest()
+            hash_utf8 = sha512_utf8
+
         KD = lambda s, d: hash_utf8("%s:%s" % (s, d))
+
         if hash_utf8 is None:
             return None
 
         # XXX not implemented yet
         entdig = None
         p_parsed = urlparse(url)
-        # : path is request-uri defined in RFC 2616 which should not be empty
+        #: path is request-uri defined in RFC 2616 which should not be empty
         path = p_parsed.path or "/"
         if p_parsed.query:
             path += '?' + p_parsed.query
+
         A1 = '%s:%s:%s' % (self.username, realm, self.password)
         A2 = '%s:%s' % (method, path)
+
         HA1 = hash_utf8(A1)
         HA2 = hash_utf8(A2)
+
         if nonce == self._thread_local.last_nonce:
             self._thread_local.nonce_count += 1
         else:
@@ -153,23 +194,27 @@ class HTTPDigestAuth(AuthBase):
         s += nonce.encode('utf-8')
         s += time.ctime().encode('utf-8')
         s += os.urandom(8)
+
         cnonce = (hashlib.sha1(s).hexdigest()[:16])
         if _algorithm == 'MD5-SESS':
             HA1 = hash_utf8('%s:%s:%s' % (HA1, nonce, cnonce))
+
         if not qop:
             respdig = KD(HA1, "%s:%s" % (nonce, HA2))
         elif qop == 'auth' or 'auth' in qop.split(','):
-            noncebit = "%s:%s:%s:%s:%s" % (nonce, ncvalue, cnonce, 'auth', HA2)
+            noncebit = "%s:%s:%s:%s:%s" % (
+                nonce, ncvalue, cnonce, 'auth', HA2
+            )
             respdig = KD(HA1, noncebit)
         else:
             # XXX handle auth-int.
             return None
 
         self._thread_local.last_nonce = nonce
+
         # XXX should the partial digests be encoded too?
-        base = 'username="%s", realm="%s", nonce="%s", uri="%s", ' 'response="%s"' % (
-            self.username, realm, nonce, path, respdig
-        )
+        base = 'username="%s", realm="%s", nonce="%s", uri="%s", ' \
+               'response="%s"' % (self.username, realm, nonce, path, respdig)
         if opaque:
             base += ', opaque="%s"' % opaque
         if algorithm:
@@ -178,6 +223,7 @@ class HTTPDigestAuth(AuthBase):
             base += ', digest="%s"' % entdig
         if qop:
             base += ', qop="auth", nc=%s, cnonce="%s"' % (ncvalue, cnonce)
+
         return 'Digest %s' % (base)
 
     def handle_redirect(self, r, **kwargs):
@@ -191,6 +237,7 @@ class HTTPDigestAuth(AuthBase):
 
         :rtype: requests.Response
         """
+
         # If response is not 4xx, do not auth
         # See https://github.com/requests/requests/issues/3772
         if not 400 <= r.status_code < 500:
@@ -202,12 +249,13 @@ class HTTPDigestAuth(AuthBase):
             # it was to resend the request.
             r.request.body.seek(self._thread_local.pos)
         s_auth = r.headers.get('www-authenticate', '')
+
         if 'digest' in s_auth.lower() and self._thread_local.num_401_calls < 2:
+
             self._thread_local.num_401_calls += 1
             pat = re.compile(r'digest ', flags=re.IGNORECASE)
-            self._thread_local.chal = parse_dict_header(
-                pat.sub('', s_auth, count=1)
-            )
+            self._thread_local.chal = parse_dict_header(pat.sub('', s_auth, count=1))
+
             # Consume content and release the original connection
             # to allow our new request to reuse the same one.
             r.content
@@ -215,12 +263,13 @@ class HTTPDigestAuth(AuthBase):
             prep = r.request.copy()
             extract_cookies_to_jar(prep._cookies, r.request, r.raw)
             prep.prepare_cookies(prep._cookies)
+
             prep.headers['Authorization'] = self.build_digest_header(
-                prep.method, prep.url
-            )
+                prep.method, prep.url)
             _r = r.connection.send(prep, **kwargs)
             _r.history.append(r)
             _r.request = prep
+
             return _r
 
         self._thread_local.num_401_calls = 1
@@ -231,9 +280,7 @@ class HTTPDigestAuth(AuthBase):
         self.init_per_thread_state()
         # If we have a saved nonce, skip the 401
         if self._thread_local.last_nonce:
-            r.headers['Authorization'] = self.build_digest_header(
-                r.method, r.url
-            )
+            r.headers['Authorization'] = self.build_digest_header(r.method, r.url)
         try:
             self._thread_local.pos = r.body.tell()
         except AttributeError:
@@ -245,15 +292,14 @@ class HTTPDigestAuth(AuthBase):
         r.register_hook('response', self.handle_401)
         r.register_hook('response', self.handle_redirect)
         self._thread_local.num_401_calls = 1
+
         return r
 
     def __eq__(self, other):
-        return all(
-            [
-                self.username == getattr(other, 'username', None),
-                self.password == getattr(other, 'password', None),
-            ]
-        )
+        return all([
+            self.username == getattr(other, 'username', None),
+            self.password == getattr(other, 'password', None)
+        ])
 
     def __ne__(self, other):
         return not self == other

requests/basics.py

@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-requests.basics
-~~~~~~~~~~~~~~~
-
-This modules covers the basics.
-"""
-
-import chardet
-
-import sys
-
-# ---------
-# Specifics
-# ---------
-from urllib.parse import (
-    urlparse,
-    urlunparse,
-    urljoin,
-    urlsplit,
-    urlencode,
-    quote,
-    unquote,
-    quote_plus,
-    unquote_plus,
-    urldefrag,
-)
-from urllib.request import (
-    parse_http_list,
-    getproxies,
-    proxy_bypass,
-    proxy_bypass_environment,
-    getproxies_environment,
-)
-from http import cookiejar as cookielib
-from http.cookies import Morsel
-from io import StringIO
-from collections import OrderedDict
-
-builtin_str = str  # type: ignore
-str = str  # type: ignore
-bytes = bytes  # type: ignore
-basestring = (str, bytes)
-numeric_types = (int, float)
-integer_types = (int,)

requests/certs.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+
 """
 requests.certs
 ~~~~~~~~~~~~~~

requests/compat.py

@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+
+"""
+requests.compat
+~~~~~~~~~~~~~~~
+
+This module handles import compatibility issues between Python 2 and
+Python 3.
+"""
+
+import chardet
+
+import sys
+
+# -------
+# Pythons
+# -------
+
+# Syntax sugar.
+_ver = sys.version_info
+
+#: Python 2.x?
+is_py2 = (_ver[0] == 2)
+
+#: Python 3.x?
+is_py3 = (_ver[0] == 3)
+
+try:
+    import simplejson as json
+except ImportError:
+    import json
+
+# ---------
+# Specifics
+# ---------
+
+if is_py2:
+    from urllib import (
+        quote, unquote, quote_plus, unquote_plus, urlencode, getproxies,
+        proxy_bypass, proxy_bypass_environment, getproxies_environment)
+    from urlparse import urlparse, urlunparse, urljoin, urlsplit, urldefrag
+    from urllib2 import parse_http_list
+    import cookielib
+    from Cookie import Morsel
+    from StringIO import StringIO
+    from collections import Callable, Mapping, MutableMapping
+
+    from urllib3.packages.ordered_dict import OrderedDict
+
+    builtin_str = str
+    bytes = str
+    str = unicode
+    basestring = basestring
+    numeric_types = (int, long, float)
+    integer_types = (int, long)
+
+elif is_py3:
+    from urllib.parse import urlparse, urlunparse, urljoin, urlsplit, urlencode, quote, unquote, quote_plus, unquote_plus, urldefrag
+    from urllib.request import parse_http_list, getproxies, proxy_bypass, proxy_bypass_environment, getproxies_environment
+    from http import cookiejar as cookielib
+    from http.cookies import Morsel
+    from io import StringIO
+    from collections import OrderedDict
+    from collections.abc import Callable, Mapping, MutableMapping
+
+    builtin_str = str
+    str = str
+    bytes = bytes
+    basestring = (str, bytes)
+    numeric_types = (int, float)
+    integer_types = (int,)

requests/cookies.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 """
 requests.cookies
 ~~~~~~~~~~~~~~~~
@@ -11,15 +12,14 @@ requests.utils imports from here, so be careful with imports.
 import copy
 import time
 import calendar
-import collections
 
 from ._internal_utils import to_native_string
-from .basics import cookielib, urlparse, urlunparse, Morsel
+from .compat import cookielib, urlparse, urlunparse, Morsel, MutableMapping
 
 try:
     import threading
 except ImportError:
-    import dummy_threading as threading  # type: ignore
+    import dummy_threading as threading
 
 
 class MockRequest(object):
@@ -53,21 +53,14 @@ class MockRequest(object):
         # header
         if not self._r.headers.get('Host'):
             return self._r.url
-
         # If they did set it, retrieve it and reconstruct the expected domain
         host = to_native_string(self._r.headers['Host'], encoding='utf-8')
         parsed = urlparse(self._r.url)
         # Reconstruct the URL as we expect it
-        return urlunparse(
-            [
-                parsed.scheme,
-                host,
-                parsed.path,
-                parsed.params,
-                parsed.query,
-                parsed.fragment,
-            ]
-        )
+        return urlunparse([
+            parsed.scheme, host, parsed.path, parsed.params, parsed.query,
+            parsed.fragment
+        ])
 
     def is_unverifiable(self):
         return True
@@ -80,9 +73,7 @@ class MockRequest(object):
 
     def add_header(self, key, val):
         """cookielib has no legitimate use for this method; add it back if you find one."""
-        raise NotImplementedError(
-            "Cookie headers should be added with add_unredirected_header()"
-        )
+        raise NotImplementedError("Cookie headers should be added with add_unredirected_header()")
 
     def add_unredirected_header(self, name, value):
         self._new_headers[name] = value
@@ -131,11 +122,9 @@ def extract_cookies_to_jar(jar, request, response):
     :param request: our own requests.Request object
     :param response: urllib3.HTTPResponse object
     """
-    if not (
-        hasattr(response, '_original_response') and response._original_response
-    ):
+    if not (hasattr(response, '_original_response') and
+            response._original_response):
         return
-
     # the _original_response field is the wrapped httplib.HTTPResponse object,
     req = MockRequest(request)
     # pull out the HTTPMessage with the headers and put it in the mock:
@@ -163,14 +152,12 @@ def remove_cookie_by_name(cookiejar, name, domain=None, path=None):
     for cookie in cookiejar:
         if cookie.name != name:
             continue
-
         if domain is not None and domain != cookie.domain:
             continue
-
         if path is not None and path != cookie.path:
             continue
-
         clearables.append((cookie.domain, cookie.path, cookie.name))
+
     for domain, path, name in clearables:
         cookiejar.clear(domain, path, name)
 
@@ -181,7 +168,7 @@ class CookieConflictError(RuntimeError):
     """
 
 
-class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
+class RequestsCookieJar(cookielib.CookieJar, MutableMapping):
     """Compatibility class; is a cookielib.CookieJar, but exposes a dict
     interface.
 
@@ -208,7 +195,6 @@ class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
         """
         try:
             return self._find_no_duplicates(name, domain, path)
-
         except KeyError:
             return default
 
@@ -219,12 +205,7 @@ class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
         """
         # support client code that unsets cookies by assignment of a None value:
         if value is None:
-            remove_cookie_by_name(
-                self,
-                name,
-                domain=kwargs.get('domain'),
-                path=kwargs.get('path'),
-            )
+            remove_cookie_by_name(self, name, domain=kwargs.get('domain'), path=kwargs.get('path'))
             return
 
         if isinstance(value, Morsel):
@@ -312,7 +293,6 @@ class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
         for cookie in iter(self):
             if cookie.domain is not None and cookie.domain in domains:
                 return True
-
             domains.append(cookie.domain)
         return False  # there is only one domain in jar
 
@@ -335,7 +315,6 @@ class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
     def __contains__(self, name):
         try:
             return super(RequestsCookieJar, self).__contains__(name)
-
         except CookieConflictError:
             return True
 
@@ -362,15 +341,9 @@ class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
         remove_cookie_by_name(self, name)
 
     def set_cookie(self, cookie, *args, **kwargs):
-        if hasattr(cookie.value, 'startswith') and cookie.value.startswith(
-            '"'
-        ) and cookie.value.endswith(
-            '"'
-        ):
+        if hasattr(cookie.value, 'startswith') and cookie.value.startswith('"') and cookie.value.endswith('"'):
             cookie.value = cookie.value.replace('\\"', '')
-        return super(RequestsCookieJar, self).set_cookie(
-            cookie, *args, **kwargs
-        )
+        return super(RequestsCookieJar, self).set_cookie(cookie, *args, **kwargs)
 
     def update(self, other):
         """Updates this jar with cookies from another CookieJar or dict-like"""
@@ -418,15 +391,11 @@ class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
                 if domain is None or cookie.domain == domain:
                     if path is None or cookie.path == path:
                         if toReturn is not None:  # if there are multiple cookies that meet passed in criteria
-                            raise CookieConflictError(
-                                'There are multiple cookies with name, %r' %
-                                (name)
-                            )
-
+                            raise CookieConflictError('There are multiple cookies with name, %r' % (name))
                         toReturn = cookie.value  # we will eventually return this as long as no cookie conflict
+
         if toReturn:
             return toReturn
-
         raise KeyError('name=%r, domain=%r, path=%r' % (name, domain, path))
 
     def __getstate__(self):
@@ -444,10 +413,15 @@ class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
 
     def copy(self):
         """Return a copy of this RequestsCookieJar."""
-        new_cj = RequestsCookieJar(self._policy)
+        new_cj = RequestsCookieJar()
+        new_cj.set_policy(self.get_policy())
         new_cj.update(self)
         return new_cj
 
+    def get_policy(self):
+        """Return the CookiePolicy instance used."""
+        return self._policy
+
 
 def _copy_cookie_jar(jar):
     if jar is None:
@@ -456,7 +430,6 @@ def _copy_cookie_jar(jar):
     if hasattr(jar, 'copy'):
         # We're dealing with an instance of RequestsCookieJar
         return jar.copy()
-
     # We're dealing with a generic CookieJar instance
     new_jar = copy.copy(jar)
     new_jar.clear()
@@ -471,21 +444,21 @@ def create_cookie(name, value, **kwargs):
     By default, the pair of `name` and `value` will be set for the domain ''
     and sent on every request (this is sometimes called a "supercookie").
     """
-    result = {
-        'version': 0,
-        'name': name,
-        'value': value,
-        'port': None,
-        'domain': '',
-        'path': '/',
-        'secure': False,
-        'expires': None,
-        'discard': True,
-        'comment': None,
-        'comment_url': None,
-        'rest': {'HttpOnly': None},
-        'rfc2109': False,
-    }
+    result = dict(
+        version=0,
+        name=name,
+        value=value,
+        port=None,
+        domain='',
+        path='/',
+        secure=False,
+        expires=None,
+        discard=True,
+        comment=None,
+        comment_url=None,
+        rest={'HttpOnly': None},
+        rfc2109=False,)
+
     badargs = set(kwargs) - set(result)
     if badargs:
         err = 'create_cookie() got unexpected keyword arguments: %s'
@@ -496,18 +469,19 @@ def create_cookie(name, value, **kwargs):
     result['domain_specified'] = bool(result['domain'])
     result['domain_initial_dot'] = result['domain'].startswith('.')
     result['path_specified'] = bool(result['path'])
+
     return cookielib.Cookie(**result)
 
 
 def morsel_to_cookie(morsel):
     """Convert a Morsel object into a Cookie containing the one k/v pair."""
+
     expires = None
     if morsel['max-age']:
         try:
             expires = int(time.time() + int(morsel['max-age']))
         except ValueError:
             raise TypeError('max-age: %s must be integer' % morsel['max-age'])
-
     elif morsel['expires']:
         time_template = '%a, %d-%b-%Y %H:%M:%S GMT'
         expires = calendar.timegm(
@@ -540,11 +514,13 @@ def cookiejar_from_dict(cookie_dict, cookiejar=None, overwrite=True):
     """
     if cookiejar is None:
         cookiejar = RequestsCookieJar()
+
     if cookie_dict is not None:
         names_from_jar = [cookie.name for cookie in cookiejar]
         for name in cookie_dict:
             if overwrite or (name not in names_from_jar):
                 cookiejar.set_cookie(create_cookie(name, cookie_dict[name]))
+
     return cookiejar
 
 
@@ -559,12 +535,12 @@ def merge_cookies(cookiejar, cookies):
 
     if isinstance(cookies, dict):
         cookiejar = cookiejar_from_dict(
-            cookies, cookiejar=cookiejar, overwrite=False
-        )
+            cookies, cookiejar=cookiejar, overwrite=False)
     elif isinstance(cookies, cookielib.CookieJar):
         try:
             cookiejar.update(cookies)
         except AttributeError:
             for cookie_in_jar in cookies:
                 cookiejar.set_cookie(cookie_in_jar)
+
     return cookiejar

requests/exceptions.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 """
 requests.exceptions
 ~~~~~~~~~~~~~~~~~~~
@@ -18,11 +19,8 @@ class RequestException(IOError):
         response = kwargs.pop('response', None)
         self.response = response
         self.request = kwargs.pop('request', None)
-        if (
-            response is not None and
-            not self.request and
-            hasattr(response, 'request')
-        ):
+        if (response is not None and not self.request and
+                hasattr(response, 'request')):
             self.request = self.response.request
         super(RequestException, self).__init__(*args, **kwargs)
 
@@ -71,12 +69,12 @@ class TooManyRedirects(RequestException):
     """Too many redirects."""
 
 
-class MissingScheme(RequestException, ValueError):
-    """The URL scheme (e.g. http or https) is missing."""
+class MissingSchema(RequestException, ValueError):
+    """The URL schema (e.g. http or https) is missing."""
 
 
-class InvalidScheme(RequestException, ValueError):
-    """See defaults.py for valid schemes."""
+class InvalidSchema(RequestException, ValueError):
+    """See defaults.py for valid schemas."""
 
 
 class InvalidURL(RequestException, ValueError):
@@ -87,6 +85,10 @@ class InvalidHeader(RequestException, ValueError):
     """The header value provided was somehow invalid."""
 
 
+class InvalidProxyURL(InvalidURL):
+    """The proxy URL provided is invalid."""
+
+
 class ChunkedEncodingError(RequestException):
     """The server declared chunked encoding but sent an invalid chunk."""
 
@@ -106,14 +108,9 @@ class RetryError(RequestException):
 class UnrewindableBodyError(RequestException):
     """Requests encountered an error when trying to rewind a body"""
 
-
-class InvalidBodyError(RequestException, ValueError):
-    """An invalid request body was specified"""
-
-
-
-
 # Warnings
+
+
 class RequestsWarning(Warning):
     """Base warning for Requests."""
     pass

requests/help.py

@@ -10,12 +10,10 @@ import idna
 import urllib3
 import chardet
 
-from .import types
-
-from .import __version__ as requests_version
+from . import __version__ as requests_version
 
 try:
-    from . packages.urllib3.contrib import pyopenssl
+    from urllib3.contrib import pyopenssl
 except ImportError:
     pyopenssl = None
     OpenSSL = None
@@ -25,7 +23,7 @@ else:
     import cryptography
 
 
-def _implementation() -> types.Help:
+def _implementation():
     """Return a dict with the Python implementation and version.
 
     Provide both the name and the version of the Python implementation
@@ -37,51 +35,66 @@ def _implementation() -> types.Help:
     to work out the correct shape of the code for those platforms.
     """
     implementation = platform.python_implementation()
+
     if implementation == 'CPython':
         implementation_version = platform.python_version()
     elif implementation == 'PyPy':
-        implementation_version = '%s.%s.%s' % (
-            sys.pypy_version_info.major,
-            sys.pypy_version_info.minor,
-            sys.pypy_version_info.micro,
-        )
+        implementation_version = '%s.%s.%s' % (sys.pypy_version_info.major,
+                                               sys.pypy_version_info.minor,
+                                               sys.pypy_version_info.micro)
         if sys.pypy_version_info.releaselevel != 'final':
-            implementation_version = ''.join(
-                [implementation_version, sys.pypy_version_info.releaselevel]
-            )
+            implementation_version = ''.join([
+                implementation_version, sys.pypy_version_info.releaselevel
+            ])
     elif implementation == 'Jython':
         implementation_version = platform.python_version()  # Complete Guess
     elif implementation == 'IronPython':
         implementation_version = platform.python_version()  # Complete Guess
     else:
         implementation_version = 'Unknown'
+
     return {'name': implementation, 'version': implementation_version}
 
 
-def info() -> types.Help:
+def info():
     """Generate information for a bug report."""
     try:
         platform_info = {
-            'system': platform.system(), 'release': platform.release()
+            'system': platform.system(),
+            'release': platform.release(),
         }
     except IOError:
-        platform_info = {'system': 'Unknown', 'release': 'Unknown'}
+        platform_info = {
+            'system': 'Unknown',
+            'release': 'Unknown',
+        }
+
     implementation_info = _implementation()
     urllib3_info = {'version': urllib3.__version__}
     chardet_info = {'version': chardet.__version__}
-    pyopenssl_info = {'version': None, 'openssl_version': ''}
+
+    pyopenssl_info = {
+        'version': None,
+        'openssl_version': '',
+    }
     if OpenSSL:
         pyopenssl_info = {
             'version': OpenSSL.__version__,
             'openssl_version': '%x' % OpenSSL.SSL.OPENSSL_VERSION_NUMBER,
         }
-    cryptography_info = {'version': getattr(cryptography, '__version__', '')}
-    idna_info = {'version': getattr(idna, '__version__', '')}
+    cryptography_info = {
+        'version': getattr(cryptography, '__version__', ''),
+    }
+    idna_info = {
+        'version': getattr(idna, '__version__', ''),
+    }
+
     # OPENSSL_VERSION_NUMBER doesn't exist in the Python 2.6 ssl module.
     system_ssl = getattr(ssl, 'OPENSSL_VERSION_NUMBER', None)
     system_ssl_info = {
         'version': '%x' % system_ssl if system_ssl is not None else ''
     }
+
     return {
         'platform': platform_info,
         'implementation': implementation_info,
@@ -92,7 +105,9 @@ def info() -> types.Help:
         'chardet': chardet_info,
         'cryptography': cryptography_info,
         'idna': idna_info,
-        'requests': {'version': requests_version},
+        'requests': {
+            'version': requests_version,
+        },
     }
 
 

requests/hooks.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 """
 requests.hooks
 ~~~~~~~~~~~~~~
@@ -14,15 +15,14 @@ HOOKS = ['response']
 
 
 def default_hooks():
-    return {event: [] for event in HOOKS}
-
-
-
+    return dict((event, []) for event in HOOKS)
 
 # TODO: response is the only one
+
+
 def dispatch_hook(key, hooks, hook_data, **kwargs):
     """Dispatches a hook dictionary on a given piece of data."""
-    hooks = hooks or {}
+    hooks = hooks or dict()
     hooks = hooks.get(key)
     if hooks:
         if hasattr(hooks, '__call__'):

requests/packages.py

@@ -0,0 +1,14 @@
+import sys
+
+# This code exists for backwards compatibility reasons.
+# I don't like it either. Just look the other way. :)
+
+for package in ('urllib3', 'idna', 'chardet'):
+    locals()[package] = __import__(package)
+    # This traversal is apparently necessary such that the identities are
+    # preserved (requests.packages.urllib3.* is urllib3.*)
+    for mod in list(sys.modules):
+        if mod == package or mod.startswith(package + '.'):
+            sys.modules['requests.packages.' + mod] = sys.modules[mod]
+
+# Kinda cool, though, right?

requests/sessions.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 """
 requests.session
 ~~~~~~~~~~~~~~~~
@@ -7,44 +8,27 @@ This module provides a Session object to manage and persist settings across
 requests (cookies, auth, proxies).
 """
 import os
-import platform
+import sys
 import time
-from collections import Mapping, OrderedDict
 from datetime import timedelta
 
 from .auth import _basic_auth_str
-from .basics import cookielib, urljoin, urlparse, str
+from .compat import cookielib, is_py3, OrderedDict, urljoin, urlparse, Mapping
 from .cookies import (
-    cookiejar_from_dict,
-    extract_cookies_to_jar,
-    RequestsCookieJar,
-    merge_cookies,
-    _copy_cookie_jar,
-)
+    cookiejar_from_dict, extract_cookies_to_jar, RequestsCookieJar, merge_cookies)
 from .models import Request, PreparedRequest, DEFAULT_REDIRECT_LIMIT
 from .hooks import default_hooks, dispatch_hook
 from ._internal_utils import to_native_string
 from .utils import to_key_val_list, default_headers
 from .exceptions import (
-    TooManyRedirects,
-    InvalidScheme,
-    ChunkedEncodingError,
-    ConnectionError,
-    ContentDecodingError,
-    InvalidHeader,
-)
+    TooManyRedirects, InvalidSchema, ChunkedEncodingError, ContentDecodingError)
 
 from .structures import CaseInsensitiveDict
 from .adapters import HTTPAdapter
 
 from .utils import (
-    requote_uri,
-    get_environ_proxies,
-    get_netrc_auth,
-    should_bypass_proxies,
-    get_auth_from_url,
-    is_valid_location,
-    rewind_body,
+    requote_uri, get_environ_proxies, get_netrc_auth, should_bypass_proxies,
+    get_auth_from_url, rewind_body
 )
 
 from .status_codes import codes
@@ -53,7 +37,7 @@ from .status_codes import codes
 from .models import REDIRECT_STATI
 
 # Preferred clock, based on which one is more accurate on a given system.
-if platform.system() == 'Windows':
+if sys.platform == 'win32':
     try:  # Python 3.4+
         preferred_clock = time.perf_counter
     except AttributeError:  # Earlier than Python 3.
@@ -65,8 +49,9 @@ else:
 def merge_setting(request_setting, session_setting, dict_class=OrderedDict):
     """Determines appropriate setting for a given request, taking into account
     the explicit setting on that request, and the setting in the session. If a
-    setting is a dictionary, they will be merged together using `dict_class`.
+    setting is a dictionary, they will be merged together using `dict_class`
     """
+
     if session_setting is None:
         return request_setting
 
@@ -75,18 +60,20 @@ def merge_setting(request_setting, session_setting, dict_class=OrderedDict):
 
     # Bypass if not a dictionary (e.g. verify)
     if not (
-        isinstance(session_setting, Mapping) and
-        isinstance(request_setting, Mapping)
+            isinstance(session_setting, Mapping) and
+            isinstance(request_setting, Mapping)
     ):
         return request_setting
 
     merged_setting = dict_class(to_key_val_list(session_setting))
     merged_setting.update(to_key_val_list(request_setting))
+
     # Remove keys that are set to None. Extract keys first to avoid altering
     # the dictionary during iteration.
     none_keys = [k for (k, v) in merged_setting.items() if v is None]
     for key in none_keys:
         del merged_setting[key]
+
     return merged_setting
 
 
@@ -107,7 +94,7 @@ def merge_hooks(request_hooks, session_hooks, dict_class=OrderedDict):
 
 class SessionRedirectMixin(object):
 
-    def get_redirect_target(self, response):
+    def get_redirect_target(self, resp):
         """Receives a Response. Returns a redirect URI or ``None``"""
         # Due to the nature of how requests processes redirects this method will
         # be called at least once upon the original response and at least twice
@@ -115,108 +102,96 @@ class SessionRedirectMixin(object):
         # If a custom mixin is used to handle this logic, it may be advantageous
         # to cache the redirect location onto the response object as a private
         # attribute.
-        if response.is_redirect:
-            if not is_valid_location(response):
-                raise InvalidHeader(
-                    'Response contains multiple Location headers. '
-                    'Unable to perform redirect.'
-                )
-
-            location = response.headers['location']
+        if resp.is_redirect:
+            location = resp.headers['location']
             # Currently the underlying http module on py3 decode headers
             # in latin1, but empirical evidence suggests that latin1 is very
             # rarely used with non-ASCII characters in HTTP headers.
             # It is more likely to get UTF8 header rather than latin1.
             # This causes incorrect handling of UTF8 encoded location headers.
             # To solve this, we re-encode the location in latin1.
-            location = location.encode('latin1')
+            if is_py3:
+                location = location.encode('latin1')
             return to_native_string(location, 'utf8')
-
         return None
 
-    def resolve_redirects(
-        self,
-        response,
-        request,
-        stream=False,
-        timeout=None,
-        verify=True,
-        cert=None,
-        proxies=None,
-        yield_requests=False,
-        **adapter_kwargs,
-    ):
-        """Given a Response, yields Responses until 'Location' header-based
-        redirection ceases, or the Session.max_redirects limit has been
-        reached.
-        """
-        history = [
-            response
-        ]  # keep track of history; seed it with the original response
-        location_url = self.get_redirect_target(response)
-        while location_url:
-            prepared_request = request.copy()
+    def resolve_redirects(self, resp, req, stream=False, timeout=None,
+                          verify=True, cert=None, proxies=None, yield_requests=False, **adapter_kwargs):
+        """Receives a Response. Returns a generator of Responses or Requests."""
+
+        hist = []  # keep track of history
+
+        url = self.get_redirect_target(resp)
+        previous_fragment = urlparse(req.url).fragment
+        while url:
+            prepared_request = req.copy()
+
+            # Update history and keep track of redirects.
+            # resp.history must ignore the original request in this loop
+            hist.append(resp)
+            resp.history = hist[1:]
+
             try:
-                response.content  # Consume socket so it can be released
-            except (
-                ChunkedEncodingError,
-                ConnectionError,
-                ContentDecodingError,
-                RuntimeError,
-            ):
-                response.raw.read(decode_content=False)
-            if len(response.history) >= self.max_redirects:
-                raise TooManyRedirects(
-                    'Exceeded %s redirects.' % self.max_redirects,
-                    response=response,
-                )
+                resp.content  # Consume socket so it can be released
+            except (ChunkedEncodingError, ContentDecodingError, RuntimeError):
+                resp.raw.read(decode_content=False)
+
+            if len(resp.history) >= self.max_redirects:
+                raise TooManyRedirects('Exceeded %s redirects.' % self.max_redirects, response=resp)
 
             # Release the connection back into the pool.
-            response.close()
+            resp.close()
+
             # Handle redirection without scheme (see: RFC 1808 Section 4)
-            if location_url.startswith('//'):
-                parsed_rurl = urlparse(response.url)
-                location_url = '%s:%s' % (
-                    to_native_string(parsed_rurl.scheme), location_url
-                )
-            # The scheme should be lower case...
-            parsed = urlparse(location_url)
-            location_url = parsed.geturl()
+            if url.startswith('//'):
+                parsed_rurl = urlparse(resp.url)
+                url = '%s:%s' % (to_native_string(parsed_rurl.scheme), url)
+
+            # Normalize url case and attach previous fragment if needed (RFC 7231 7.1.2)
+            parsed = urlparse(url)
+            if parsed.fragment == '' and previous_fragment:
+                parsed = parsed._replace(fragment=previous_fragment)
+            elif parsed.fragment:
+                previous_fragment = parsed.fragment
+            url = parsed.geturl()
+
             # Facilitate relative 'location' headers, as allowed by RFC 7231.
             # (e.g. '/path/to/resource' instead of 'http://domain.tld/path/to/resource')
             # Compliant with RFC3986, we percent encode the url.
             if not parsed.netloc:
-                location_url = urljoin(response.url, requote_uri(location_url))
+                url = urljoin(resp.url, requote_uri(url))
             else:
-                location_url = requote_uri(location_url)
-            prepared_request.url = to_native_string(location_url)
-            method_changed = self.rebuild_method(prepared_request, response)
-            # https://github.com/kennethreitz/requests/issues/2590
-            # If method is changed to GET we need to remove body and associated headers.
-            if method_changed and prepared_request.method == 'GET':
+                url = requote_uri(url)
+
+            prepared_request.url = to_native_string(url)
+
+            self.rebuild_method(prepared_request, resp)
+
+            # https://github.com/requests/requests/issues/1084
+            if resp.status_code not in (codes.temporary_redirect, codes.permanent_redirect):
                 # https://github.com/requests/requests/issues/3490
-                purged_headers = (
-                    'Content-Length', 'Content-Type', 'Transfer-Encoding'
-                )
+                purged_headers = ('Content-Length', 'Content-Type', 'Transfer-Encoding')
                 for header in purged_headers:
                     prepared_request.headers.pop(header, None)
                 prepared_request.body = None
+
             headers = prepared_request.headers
             try:
                 del headers['Cookie']
             except KeyError:
                 pass
+
             # Extract any cookies sent on the response to the cookiejar
             # in the new request. Because we've mutated our copied prepared
             # request, use the old one that we haven't yet touched.
-            extract_cookies_to_jar(
-                prepared_request._cookies, request, response.raw
-            )
+            extract_cookies_to_jar(prepared_request._cookies, req, resp.raw)
             merge_cookies(prepared_request._cookies, self.cookies)
             prepared_request.prepare_cookies(prepared_request._cookies)
+
             # Rebuild auth and proxy information.
             proxies = self.rebuild_proxies(prepared_request, proxies)
-            self.rebuild_auth(prepared_request, response)
+            self.rebuild_auth(prepared_request, resp)
+
             # A failed tell() sets `_body_position` to `object()`. This non-None
             # value ensures `rewindable` will be True, allowing us to raise an
             # UnrewindableBodyError, instead of hanging the connection.
@@ -224,63 +199,65 @@ class SessionRedirectMixin(object):
                 prepared_request._body_position is not None and
                 ('Content-Length' in headers or 'Transfer-Encoding' in headers)
             )
+
             # Attempt to rewind consumed file-like object.
             if rewindable:
                 rewind_body(prepared_request)
-            # Override the original request.
-            request = prepared_request
-            if yield_requests:
-                yield request
 
+            # Override the original request.
+            req = prepared_request
+
+            if yield_requests:
+                yield req
             else:
-                response = self.send(
-                    request,
+
+                resp = self.send(
+                    req,
                     stream=stream,
                     timeout=timeout,
                     verify=verify,
                     cert=cert,
                     proxies=proxies,
                     allow_redirects=False,
-                    **adapter_kwargs,
-                )
-                # copy our history tracker into the response
-                response.history = history[:]
-                # append the new response to the history tracker for the next iteration
-                history.append(response)
-                extract_cookies_to_jar(
-                    self.cookies, prepared_request, response.raw
+                    **adapter_kwargs
                 )
+
+                extract_cookies_to_jar(self.cookies, prepared_request, resp.raw)
+
                 # extract redirect url, if any, for the next loop
-                location_url = self.get_redirect_target(response)
-                yield response
+                url = self.get_redirect_target(resp)
+                yield resp
 
     def rebuild_auth(self, prepared_request, response):
         """When being redirected we may want to strip authentication from the
-        request to avoid leaking credentials. This method intelligently
-        removes
+        request to avoid leaking credentials. This method intelligently removes
         and reapplies authentication where possible to avoid credential loss.
         """
         headers = prepared_request.headers
         url = prepared_request.url
+
         if 'Authorization' in headers:
             # If we get redirected to a new host, we should strip out any
             # authentication headers.
             original_parsed = urlparse(response.request.url)
             redirect_parsed = urlparse(url)
+
             if (original_parsed.hostname != redirect_parsed.hostname):
                 del headers['Authorization']
+
         # .netrc might have more auth for us on our new host.
         new_auth = get_netrc_auth(url) if self.trust_env else None
         if new_auth is not None:
             prepared_request.prepare_auth(new_auth)
+
         return
 
     def rebuild_proxies(self, prepared_request, proxies):
-        """This method re-evaluates the proxy configuration by
-        considering the environment variables. If we are redirected to a
-        URL covered by NO_PROXY, we strip the proxy configuration.
-        Otherwise, we set missing proxy keys for this URL (in case they
-        were stripped by a previous redirect).
+        """This method re-evaluates the proxy configuration by considering the
+        environment variables. If we are redirected to a URL covered by
+        NO_PROXY, we strip the proxy configuration. Otherwise, we set missing
+        proxy keys for this URL (in case they were stripped by a previous
+        redirect).
 
         This method also replaces the Proxy-Authorization header where
         necessary.
@@ -293,46 +270,50 @@ class SessionRedirectMixin(object):
         scheme = urlparse(url).scheme
         new_proxies = proxies.copy()
         no_proxy = proxies.get('no_proxy')
+
         bypass_proxy = should_bypass_proxies(url, no_proxy=no_proxy)
         if self.trust_env and not bypass_proxy:
             environ_proxies = get_environ_proxies(url, no_proxy=no_proxy)
+
             proxy = environ_proxies.get(scheme, environ_proxies.get('all'))
+
             if proxy:
                 new_proxies.setdefault(scheme, proxy)
+
         if 'Proxy-Authorization' in headers:
             del headers['Proxy-Authorization']
+
         try:
             username, password = get_auth_from_url(new_proxies[scheme])
         except KeyError:
             username, password = None, None
+
         if username and password:
-            headers['Proxy-Authorization'] = _basic_auth_str(
-                username, password
-            )
+            headers['Proxy-Authorization'] = _basic_auth_str(username, password)
+
         return new_proxies
 
     def rebuild_method(self, prepared_request, response):
         """When being redirected we may want to change the method of the request
         based on certain specs or browser behavior.
-
-        :rtype bool:
-        :return: boolean expressing if the method changed during rebuild.
         """
-        method = original_method = prepared_request.method
+        method = prepared_request.method
+
         # http://tools.ietf.org/html/rfc7231#section-6.4.4
         if response.status_code == codes.see_other and method != 'HEAD':
             method = 'GET'
-        # If a POST is responded to with a 301 or 302, turn it into a GET. This has
-        # become a common pattern in browsers and was introduced into later versions
-        # of HTTP RFCs. While some browsers transform other methods to GET, little of
-        # that has been standardized. For that reason, we're using curl as a model
-        # which only supports POST->GET.
-        if response.status_code in (
-            codes.found, codes.moved
-        ) and method == 'POST':
+
+        # Do what the browsers do, despite standards...
+        # First, turn 302s into GETs.
+        if response.status_code == codes.found and method != 'HEAD':
             method = 'GET'
+
+        # Second, if a POST is responded to with a 301, turn it into a GET.
+        # This bizarre behaviour is explained in Issue 1704.
+        if response.status_code == codes.moved and method == 'POST':
+            method = 'GET'
+
         prepared_request.method = method
-        return method != original_method
 
 
 class Session(SessionRedirectMixin):
@@ -353,62 +334,63 @@ class Session(SessionRedirectMixin):
       >>>     s.get('http://httpbin.org/get')
       <Response [200]>
     """
-    __slots__ = [
-        'headers',
-        'cookies',
-        'auth',
-        'proxies',
-        'hooks',
-        'params',
-        'verify',
-        'cert',
-        'prefetch',
-        'adapters',
-        'stream',
-        'trust_env',
+
+    __attrs__ = [
+        'headers', 'cookies', 'auth', 'proxies', 'hooks', 'params', 'verify',
+        'cert', 'prefetch', 'adapters', 'stream', 'trust_env',
         'max_redirects',
     ]
 
-    __slots__
-
     def __init__(self):
-        # : A case-insensitive dictionary of headers to be sent on each
+
+        #: A case-insensitive dictionary of headers to be sent on each
         #: :class:`Request <Request>` sent from this
         #: :class:`Session <Session>`.
         self.headers = default_headers()
-        # : Default Authentication tuple or object to attach to
+
+        #: Default Authentication tuple or object to attach to
         #: :class:`Request <Request>`.
         self.auth = None
-        # : Dictionary mapping protocol or protocol and host to the URL of the proxy
+
+        #: Dictionary mapping protocol or protocol and host to the URL of the proxy
         #: (e.g. {'http': 'foo.bar:3128', 'http://host.name': 'foo.bar:4012'}) to
         #: be used on each :class:`Request <Request>`.
         self.proxies = {}
-        # : Event-handling hooks.
+
+        #: Event-handling hooks.
         self.hooks = default_hooks()
-        # : Dictionary of querystring data to attach to each
+
+        #: Dictionary of querystring data to attach to each
         #: :class:`Request <Request>`. The dictionary values may be lists for
         #: representing multivalued query parameters.
         self.params = {}
-        # : Stream response content default.
+
+        #: Stream response content default.
         self.stream = False
-        # : SSL Verification default.
+
+        #: SSL Verification default.
         self.verify = True
-        # : SSL client certificate default, if String, path to ssl client
+
+        #: SSL client certificate default, if String, path to ssl client
         #: cert file (.pem). If Tuple, ('cert', 'key') pair.
         self.cert = None
-        # : Maximum number of redirects allowed. If the request exceeds this
+
+        #: Maximum number of redirects allowed. If the request exceeds this
         #: limit, a :class:`TooManyRedirects` exception is raised.
         #: This defaults to requests.models.DEFAULT_REDIRECT_LIMIT, which is
         #: 30.
         self.max_redirects = DEFAULT_REDIRECT_LIMIT
-        # : Trust environment settings for proxy configuration, default
+
+        #: Trust environment settings for proxy configuration, default
         #: authentication and similar.
         self.trust_env = True
-        # : A CookieJar containing all currently outstanding cookies set on this
+
+        #: A CookieJar containing all currently outstanding cookies set on this
         #: session. By default it is a
         #: :class:`RequestsCookieJar <requests.cookies.RequestsCookieJar>`, but
         #: may be any other ``cookielib.CookieJar`` compatible object.
         self.cookies = cookiejar_from_dict({})
+
         # Default connection adapters.
         self.adapters = OrderedDict()
         self.mount('https://', HTTPAdapter())
@@ -427,20 +409,24 @@ class Session(SessionRedirectMixin):
         :class:`Session`.
 
         :param request: :class:`Request` instance to prepare with this
-            Session's settings.
+            session's settings.
         :rtype: requests.PreparedRequest
         """
         cookies = request.cookies or {}
+
         # Bootstrap CookieJar.
         if not isinstance(cookies, cookielib.CookieJar):
             cookies = cookiejar_from_dict(cookies)
+
         # Merge with session cookies
-        session_cookies = _copy_cookie_jar(self.cookies)
-        merged_cookies = merge_cookies(session_cookies, cookies)
+        merged_cookies = merge_cookies(
+            merge_cookies(RequestsCookieJar(), self.cookies), cookies)
+
         # Set environment's basic authentication if not explicitly set.
         auth = request.auth
         if self.trust_env and not auth and not self.auth:
             auth = get_netrc_auth(request.url)
+
         p = PreparedRequest()
         p.prepare(
             method=request.method.upper(),
@@ -448,9 +434,7 @@ class Session(SessionRedirectMixin):
             files=request.files,
             data=request.data,
             json=request.json,
-            headers=merge_setting(
-                request.headers, self.headers, dict_class=CaseInsensitiveDict
-            ),
+            headers=merge_setting(request.headers, self.headers, dict_class=CaseInsensitiveDict),
             params=merge_setting(request.params, self.params),
             auth=merge_setting(auth, self.auth),
             cookies=merged_cookies,
@@ -458,26 +442,11 @@ class Session(SessionRedirectMixin):
         )
         return p
 
-    def request(
-        self,
-        method,
-        url,
-        params=None,
-        data=None,
-        headers=None,
-        cookies=None,
-        files=None,
-        auth=None,
-        timeout=None,
-        allow_redirects=True,
-        proxies=None,
-        hooks=None,
-        stream=None,
-        verify=None,
-        cert=None,
-        json=None,
-    ):
-        """Constructs a :class:`Request <Request>`, prepares it, and sends it.
+    def request(self, method, url,
+            params=None, data=None, headers=None, cookies=None, files=None,
+            auth=None, timeout=None, allow_redirects=True, proxies=None,
+            hooks=None, stream=None, verify=None, cert=None, json=None):
+        """Constructs a :class:`Request <Request>`, prepares it and sends it.
         Returns :class:`Response <Response>` object.
 
         :param method: method for the new :class:`Request` object.
@@ -527,14 +496,21 @@ class Session(SessionRedirectMixin):
             hooks=hooks,
         )
         prep = self.prepare_request(req)
+
         proxies = proxies or {}
+
         settings = self.merge_environment_settings(
             prep.url, proxies, stream, verify, cert
         )
+
         # Send the request.
-        send_kwargs = {'timeout': timeout, 'allow_redirects': allow_redirects}
+        send_kwargs = {
+            'timeout': timeout,
+            'allow_redirects': allow_redirects,
+        }
         send_kwargs.update(settings)
         resp = self.send(prep, **send_kwargs)
+
         return resp
 
     def get(self, url, **kwargs):
@@ -544,6 +520,7 @@ class Session(SessionRedirectMixin):
         :param \*\*kwargs: Optional arguments that ``request`` takes.
         :rtype: requests.Response
         """
+
         kwargs.setdefault('allow_redirects', True)
         return self.request('GET', url, **kwargs)
 
@@ -554,6 +531,7 @@ class Session(SessionRedirectMixin):
         :param \*\*kwargs: Optional arguments that ``request`` takes.
         :rtype: requests.Response
         """
+
         kwargs.setdefault('allow_redirects', True)
         return self.request('OPTIONS', url, **kwargs)
 
@@ -564,6 +542,7 @@ class Session(SessionRedirectMixin):
         :param \*\*kwargs: Optional arguments that ``request`` takes.
         :rtype: requests.Response
         """
+
         kwargs.setdefault('allow_redirects', False)
         return self.request('HEAD', url, **kwargs)
 
@@ -576,6 +555,7 @@ class Session(SessionRedirectMixin):
         :param \*\*kwargs: Optional arguments that ``request`` takes.
         :rtype: requests.Response
         """
+
         return self.request('POST', url, data=data, json=json, **kwargs)
 
     def put(self, url, data=None, **kwargs):
@@ -586,6 +566,7 @@ class Session(SessionRedirectMixin):
         :param \*\*kwargs: Optional arguments that ``request`` takes.
         :rtype: requests.Response
         """
+
         return self.request('PUT', url, data=data, **kwargs)
 
     def patch(self, url, data=None, **kwargs):
@@ -596,6 +577,7 @@ class Session(SessionRedirectMixin):
         :param \*\*kwargs: Optional arguments that ``request`` takes.
         :rtype: requests.Response
         """
+
         return self.request('PATCH', url, data=data, **kwargs)
 
     def delete(self, url, **kwargs):
@@ -605,6 +587,7 @@ class Session(SessionRedirectMixin):
         :param \*\*kwargs: Optional arguments that ``request`` takes.
         :rtype: requests.Response
         """
+
         return self.request('DELETE', url, **kwargs)
 
     def send(self, request, **kwargs):
@@ -618,52 +601,66 @@ class Session(SessionRedirectMixin):
         kwargs.setdefault('verify', self.verify)
         kwargs.setdefault('cert', self.cert)
         kwargs.setdefault('proxies', self.proxies)
+
         # It's possible that users might accidentally send a Request object.
         # Guard against that specific failure case.
         if isinstance(request, Request):
             raise ValueError('You can only send PreparedRequests.')
 
-        # Set up variables needed for resolve_redirects and dispatching of
-        # hooks
+        # Set up variables needed for resolve_redirects and dispatching of hooks
         allow_redirects = kwargs.pop('allow_redirects', True)
         stream = kwargs.get('stream')
         hooks = request.hooks
+
         # Get the appropriate adapter to use
         adapter = self.get_adapter(url=request.url)
+
         # Start time (approximately) of the request
         start = preferred_clock()
+
         # Send the request
         r = adapter.send(request, **kwargs)
+
         # Total elapsed time of the request (approximately)
         elapsed = preferred_clock() - start
         r.elapsed = timedelta(seconds=elapsed)
-        # Response manipulation hooks.
+
+        # Response manipulation hooks
         r = dispatch_hook('response', hooks, r, **kwargs)
+
         # Persist cookies
         if r.history:
+
             # If the hooks create history then we want those cookies too
             for resp in r.history:
                 extract_cookies_to_jar(self.cookies, resp.request, resp.raw)
+
         extract_cookies_to_jar(self.cookies, request, r.raw)
+
         # Redirect resolving generator.
         gen = self.resolve_redirects(r, request, **kwargs)
-        # Resolve redirects, if allowed.
+
+        # Resolve redirects if allowed.
         history = [resp for resp in gen] if allow_redirects else []
-        # If there is a history, replace ``r`` with the last response
+
+        # Shuffle things around if there's history.
         if history:
+            # Insert the first (original) request at the start
+            history.insert(0, r)
+            # Get the last request made
             r = history.pop()
+            r.history = history
+
         # If redirects aren't being followed, store the response on the Request for Response.next().
         if not allow_redirects:
             try:
-                r._next = next(
-                    self.resolve_redirects(
-                        r, request, yield_requests=True, **kwargs
-                    )
-                )
+                r._next = next(self.resolve_redirects(r, request, yield_requests=True, **kwargs))
             except StopIteration:
                 pass
+
         if not stream:
             r.content
+
         return r
 
     def merge_environment_settings(self, url, proxies, stream, verify, cert):
@@ -672,41 +669,28 @@ class Session(SessionRedirectMixin):
 
         :rtype: dict
         """
-        # Merge all the kwargs except for proxies.
-        stream = merge_setting(stream, self.stream)
-        verify = merge_setting(verify, self.verify)
-        cert = merge_setting(cert, self.cert)
         # Gather clues from the surrounding environment.
-        # We do this after merging the Session values to make sure we don't
-        # accidentally exclude them.
         if self.trust_env:
+            # Set environment's proxies.
+            no_proxy = proxies.get('no_proxy') if proxies is not None else None
+            env_proxies = get_environ_proxies(url, no_proxy=no_proxy)
+            for (k, v) in env_proxies.items():
+                proxies.setdefault(k, v)
+
             # Look for requests environment configuration and be compatible
             # with cURL.
             if verify is True or verify is None:
-                verify = (
-                    os.environ.get('REQUESTS_CA_BUNDLE') or
-                    os.environ.get('CURL_CA_BUNDLE') or
-                    verify
-                )
-        # Now we handle proxies.
-        # Proxies need to be built up backwards. This is because None values
-        # can delete proxy information, which can then be re-added by a more
-        # specific layer. So we begin by getting the environment's proxies,
-        # then add the Session, then add the request.
-        no_proxy = proxies.get('no_proxy') if proxies is not None else None
-        if no_proxy is None:
-            no_proxy = self.proxies.get('no_proxy')
-        env_proxies = {}
-        if self.trust_env:
-            env_proxies = get_environ_proxies(url, no_proxy=no_proxy) or {}
-        new_proxies = merge_setting(self.proxies, env_proxies)
-        proxies = merge_setting(proxies, new_proxies)
-        return {
-            'verify': verify,
-            'proxies': proxies,
-            'stream': stream,
-            'cert': cert,
-        }
+                verify = (os.environ.get('REQUESTS_CA_BUNDLE') or
+                          os.environ.get('CURL_CA_BUNDLE'))
+
+        # Merge all the kwargs.
+        proxies = merge_setting(proxies, self.proxies)
+        stream = merge_setting(stream, self.stream)
+        verify = merge_setting(verify, self.verify)
+        cert = merge_setting(cert, self.cert)
+
+        return {'verify': verify, 'proxies': proxies, 'stream': stream,
+                'cert': cert}
 
     def get_adapter(self, url):
         """
@@ -715,14 +699,15 @@ class Session(SessionRedirectMixin):
         :rtype: requests.adapters.BaseAdapter
         """
         for (prefix, adapter) in self.adapters.items():
-            if url.lower().startswith(prefix):
+
+            if url.lower().startswith(prefix.lower()):
                 return adapter
 
         # Nothing matches :-/
-        raise InvalidScheme("No connection adapters were found for '%s'" % url)
+        raise InvalidSchema("No connection adapters were found for '%s'" % url)
 
     def close(self):
-        """Closes all adapters and, as such, the Session."""
+        """Closes all adapters and as such the session"""
         for v in self.adapters.values():
             v.close()
 
@@ -733,13 +718,24 @@ class Session(SessionRedirectMixin):
         """
         self.adapters[prefix] = adapter
         keys_to_move = [k for k in self.adapters if len(k) < len(prefix)]
+
         for key in keys_to_move:
             self.adapters[key] = self.adapters.pop(key)
 
     def __getstate__(self):
-        state = {attr: getattr(self, attr, None) for attr in self.__slots__}
+        state = dict((attr, getattr(self, attr, None)) for attr in self.__attrs__)
         return state
 
     def __setstate__(self, state):
         for attr, value in state.items():
             setattr(self, attr, value)
+
+
+def session():
+    """
+    Returns a :class:`Session` for context-management.
+
+    :rtype: Session
+    """
+
+    return Session()

requests/status_codes.py

@@ -1,7 +1,26 @@
 # -*- coding: utf-8 -*-
+
+"""
+The ``codes`` object defines a mapping from common names for HTTP statuses
+to their numerical codes, accessible either as attributes or as dictionary
+items.
+
+>>> requests.codes['temporary_redirect']
+307
+>>> requests.codes.teapot
+418
+>>> requests.codes['\o/']
+200
+
+Some codes have multiple names, and both upper- and lower-case versions of
+the names are allowed. For example, ``codes.ok``, ``codes.OK``, and
+``codes.okay`` all correspond to the HTTP status code 200.
+"""
+
 from .structures import LookupDict
 
 _codes = {
+
     # Informational.
     100: ('continue',),
     101: ('switching_protocols',),
@@ -18,6 +37,7 @@ _codes = {
     207: ('multi_status', 'multiple_status', 'multi_stati', 'multiple_stati'),
     208: ('already_reported',),
     226: ('im_used',),
+
     # Redirection.
     300: ('multiple_choices',),
     301: ('moved_permanently', 'moved', '\\o-'),
@@ -27,8 +47,9 @@ _codes = {
     305: ('use_proxy',),
     306: ('switch_proxy',),
     307: ('temporary_redirect', 'temporary_moved', 'temporary'),
-    308: ('permanent_redirect', 'resume_incomplete', 'resume'),
-    # These 2 to be removed in 3.0
+    308: ('permanent_redirect',
+          'resume_incomplete', 'resume',),  # These 2 to be removed in 3.0
+
     # Client Error.
     400: ('bad_request', 'bad'),
     401: ('unauthorized',),
@@ -37,9 +58,7 @@ _codes = {
     404: ('not_found', '-o-'),
     405: ('method_not_allowed', 'not_allowed'),
     406: ('not_acceptable',),
-    407: (
-        'proxy_authentication_required', 'proxy_auth', 'proxy_authentication'
-    ),
+    407: ('proxy_authentication_required', 'proxy_auth', 'proxy_authentication'),
     408: ('request_timeout', 'timeout'),
     409: ('conflict',),
     410: ('gone',),
@@ -48,11 +67,7 @@ _codes = {
     413: ('request_entity_too_large',),
     414: ('request_uri_too_large',),
     415: ('unsupported_media_type', 'unsupported_media', 'media_type'),
-    416: (
-        'requested_range_not_satisfiable',
-        'requested_range',
-        'range_not_satisfiable',
-    ),
+    416: ('requested_range_not_satisfiable', 'requested_range', 'range_not_satisfiable'),
     417: ('expectation_failed',),
     418: ('im_a_teapot', 'teapot', 'i_am_a_teapot'),
     421: ('misdirected_request',),
@@ -69,6 +84,7 @@ _codes = {
     450: ('blocked_by_windows_parental_controls', 'parental_controls'),
     451: ('unavailable_for_legal_reasons', 'legal_reasons'),
     499: ('client_closed_request',),
+
     # Server Error.
     500: ('internal_server_error', 'server_error', '/o\\', '✗'),
     501: ('not_implemented',),
@@ -80,15 +96,24 @@ _codes = {
     507: ('insufficient_storage',),
     509: ('bandwidth_limit_exceeded', 'bandwidth'),
     510: ('not_extended',),
-    511: (
-        'network_authentication_required',
-        'network_auth',
-        'network_authentication',
-    ),
+    511: ('network_authentication_required', 'network_auth', 'network_authentication'),
 }
+
 codes = LookupDict(name='status_codes')
-for code, titles in _codes.items():
-    for title in titles:  # type: ignore
-        setattr(codes, title, code)
-        if not title.startswith(('\\', '/')):
-            setattr(codes, title.upper(), code)
+
+def _init():
+    for code, titles in _codes.items():
+        for title in titles:
+            setattr(codes, title, code)
+            if not title.startswith(('\\', '/')):
+                setattr(codes, title.upper(), code)
+
+    def doc(code):
+        names = ', '.join('``%s``' % n for n in _codes[code])
+        return '* %d: %s' % (code, names)
+
+    global __doc__
+    __doc__ = (__doc__ + '\n' +
+               '\n'.join(doc(code) for code in sorted(_codes)))
+
+_init()

requests/structures.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 """
 requests.structures
 ~~~~~~~~~~~~~~~~~~~
@@ -6,16 +7,14 @@ requests.structures
 Data structures that power Requests.
 """
 
-import collections
-
-from .basics import basestring, OrderedDict
+from .compat import OrderedDict, Mapping, MutableMapping
 
 
-class CaseInsensitiveDict(collections.MutableMapping):
+class CaseInsensitiveDict(MutableMapping):
     """A case-insensitive ``dict``-like object.
 
     Implements all methods and operations of
-    ``collections.MutableMapping`` as well as dict's ``copy``. Also
+    ``MutableMapping`` as well as dict's ``copy``. Also
     provides ``lower_items``.
 
     All keys are expected to be strings. The structure remembers the
@@ -37,10 +36,9 @@ class CaseInsensitiveDict(collections.MutableMapping):
     operations are given keys that have equal ``.lower()``s, the
     behavior is undefined.
     """
-    __slots__ = ('_store')
 
     def __init__(self, data=None, **kwargs):
-        self._store = collections.OrderedDict()
+        self._store = OrderedDict()
         if data is None:
             data = {}
         self.update(data, **kwargs)
@@ -65,19 +63,19 @@ class CaseInsensitiveDict(collections.MutableMapping):
     def lower_items(self):
         """Like iteritems(), but with all lowercase keys."""
         return (
-            (lowerkey, keyval[1]) for (lowerkey, keyval) in self._store.items()
+            (lowerkey, keyval[1])
+            for (lowerkey, keyval)
+            in self._store.items()
         )
 
     def __eq__(self, other):
-        if isinstance(other, collections.Mapping):
+        if isinstance(other, Mapping):
             other = CaseInsensitiveDict(other)
         else:
             return NotImplemented
-
         # Compare insensitively
         return dict(self.lower_items()) == dict(other.lower_items())
 
-
     # Copy is required
     def copy(self):
         return CaseInsensitiveDict(self._store.values())
@@ -86,128 +84,6 @@ class CaseInsensitiveDict(collections.MutableMapping):
         return str(dict(self.items()))
 
 
-class HTTPHeaderDict(CaseInsensitiveDict):
-    """A case-insensitive ``dict``-like object suitable for HTTP headers that
-    supports multiple values with the same key, via the ``add``, ``extend``,
-    ``multiget`` and ``multiset`` methods.
-    """
-
-    def __init__(self, data=None, **kwargs):
-        super(HTTPHeaderDict, self).__init__()
-        self.extend({} if data is None else data, **kwargs)
-
-
-    # We'll store tuples in the internal dictionary, but present them as a
-    # concatenated string when we use item access methods.
-    #
-    def __setitem__(self, key, val):
-        # Special–case null values.
-        if (not isinstance(val, basestring)) and (val is not None):
-            raise ValueError('only string-type values (or None) are allowed')
-
-        super(HTTPHeaderDict, self).__setitem__(key, (val,))
-
-    def __getitem__(self, key):
-        val = super(HTTPHeaderDict, self).__getitem__(key)
-        # Special–case null values.
-        if len(val) == 1 and val[0] is None:
-            return val[0]
-
-        return ', '.join(val)
-
-    def lower_items(self):
-        return (
-            (lk, ', '.join(vals)) for (lk, (k, vals)) in self._store.items()
-        )
-
-    def copy(self):
-        return type(self)(self)
-
-    def getlist(self, key):
-        """Returns a list of all the values for the named field. Returns an
-        empty list if the key isn't present in the dictionary."""
-        return list(self._store.get(key.lower(), (None, []))[1])
-
-    def setlist(self, key, values):
-        """Set a sequence of strings to the associated key - this will overwrite
-        any previously stored value."""
-        if not isinstance(values, (list, tuple)):
-            raise ValueError('argument is not sequence')
-
-        if any(not isinstance(v, basestring) for v in values):
-            raise ValueError('non-string items in sequence')
-
-        if not values:
-            self.pop(key, None)
-            return
-
-        super(HTTPHeaderDict, self).__setitem__(key, tuple(values))
-
-    def _extend(self, key, values):
-        new_value_tpl = key, values
-        # Inspired by urllib3's implementation - use one call which should be
-        # suitable for the common case.
-        old_value_tpl = self._store.setdefault(key.lower(), new_value_tpl)
-        if old_value_tpl is not new_value_tpl:
-            old_key, old_values = old_value_tpl
-            self._store[key.lower()] = (old_key, old_values + values)
-
-    def add(self, key, val):
-        """Adds a key, value pair to this dictionary - if there is already a
-        value for this key, then the value will be appended to those values.
-        """
-        if not isinstance(val, basestring):
-            raise ValueError('value must be a string-type object')
-
-        self._extend(key, (val,))
-
-    def extend(self, *args, **kwargs):
-        """Like update, but will add values to existing sequences rather than
-        replacing them. You can pass a mapping object or a sequence of two
-        tuples - values in these objects can be strings or sequence of strings.
-        """
-        if len(args) > 1:
-            raise TypeError(
-                f"extend() takes at most 1 positional "
-                "arguments ({len(args)} given)"
-            )
-
-        for other in args + (kwargs,):
-            if isinstance(other, collections.Mapping):
-                # See if looks like a HTTPHeaderDict (either urllib3's
-                # implementation or ours). If so, then we have to add values
-                # in one go for each key.
-                multiget = getattr(other, 'getlist', None)
-                if multiget:
-                    for key in other:
-                        self._extend(key, tuple(multiget(key)))
-                    continue
-
-                # Otherwise, just walk over items to get them.
-                item_seq = other.items()
-            else:
-                item_seq = other
-            for ik, iv in item_seq:
-                if isinstance(iv, basestring):
-                    self._extend(ik, (iv,))
-                elif any(not isinstance(v, basestring) for v in iv):
-                    raise ValueError('non-string items in sequence')
-
-                else:
-                    self._extend(ik, tuple(iv))
-
-    @property
-    def _as_dict(self):
-        """A dictionary representation of the HTTPHeaderDict."""
-        d = {}
-        for k, vals in self._store.values():
-            d[k] = vals[0] if len(vals) == 1 else vals
-        return d
-
-    def __repr__(self):
-        return repr(self._as_dict)
-
-
 class LookupDict(dict):
     """Dictionary lookup object."""
 
@@ -216,14 +92,12 @@ class LookupDict(dict):
         super(LookupDict, self).__init__()
 
     def __repr__(self):
-        return f'<lookup \'{self.name}\'>'
+        return '<lookup \'%s\'>' % (self.name)
 
     def __getitem__(self, key):
         # We allow fall-through here, so values default to None
-        return self.__dict__.get(key, None)
 
-    def __iter__(self):
-        return super(LookupDict, self).__dir__()
+        return self.__dict__.get(key, None)
 
     def get(self, key, default=None):
         return self.__dict__.get(key, default)

requests/types.py

@@ -1,72 +0,0 @@
-from typing import (
-    Callable,
-    Optional,
-    Union,
-    Any,
-    Iterable,
-    List,
-    Mapping,
-    MutableMapping,
-    Tuple,
-    IO,
-    Text,
-    Type,
-    Dict,
-)
-
-from .import auth
-from .models import Response, PreparedRequest
-from .cookies import RequestsCookieJar
-from .sessions import Session
-
-_ParamsMappingValueType = Union[
-    str, bytes, int, float, Iterable[Union[str, bytes, int, float]]
-]
-Params = Optional[
-    Union[
-        Mapping[Union[str, bytes, int, float], _ParamsMappingValueType],
-        Union[str, bytes],
-        Tuple[Union[str, bytes, int, float], _ParamsMappingValueType],
-        Mapping[str, _ParamsMappingValueType],
-        Mapping[bytes, _ParamsMappingValueType],
-        Mapping[int, _ParamsMappingValueType],
-        Mapping[float, _ParamsMappingValueType],
-    ]
-]
-Data = Union[
-    None,
-    bytes,
-    MutableMapping[str, str],
-    MutableMapping[str, Text],
-    MutableMapping[Text, str],
-    MutableMapping[Text, Text],
-    Iterable[Tuple[str, str]],
-    IO,
-]
-_Hook = Callable[[Response], Any]
-Method = str
-URL = str
-Headers = Optional[Union[None, MutableMapping[Text, Text]]]
-Cookies = Optional[Union[None, RequestsCookieJar, MutableMapping[Text, Text]]]
-Files = Optional[MutableMapping[Text, IO]]
-Auth = Union[
-    None,
-    Tuple[Text, Text],
-    auth.AuthBase,
-    Callable[[PreparedRequest], PreparedRequest],
-]
-Timeout = Union[None, float, Tuple[float, float]]
-AllowRedirects = Optional[bool]
-Proxies = Optional[MutableMapping[Text, Text]]
-Hooks = Optional[MutableMapping[Text, Union[Iterable[_Hook], _Hook]]]
-Stream = Optional[bool]
-Verify = Union[None, bool, Text]
-Cert = Union[Text, Tuple[Text, Text]]
-JSON = Optional[MutableMapping]
-Help = Dict
-Host = str
-Sequence = List
-Filename = str
-KeyValueList = List[Tuple[Text, Text]]
-String = str
-Boolean = Union[bool, None]

setup.cfg

@@ -1,2 +1,5 @@
 [bdist_wheel]
 universal = 1
+
+[metadata]
+license_file = LICENSE

setup.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 # Learn more: https://github.com/kennethreitz/setup.py
+
 import os
+import re
 import sys
 
 from codecs import open
@@ -10,27 +12,16 @@ from setuptools.command.test import test as TestCommand
 
 here = os.path.abspath(os.path.dirname(__file__))
 
-
-class Format(TestCommand):
-    user_options = []
-
-    def initialize_options(self):
-        TestCommand.initialize_options(self)
-        pass
-
-    def finalize_options(self):
-        pass
-
-    def run_tests(self):
-        os.system('white requests')
-
-
 class PyTest(TestCommand):
     user_options = [('pytest-args=', 'a', "Arguments to pass into py.test")]
 
     def initialize_options(self):
         TestCommand.initialize_options(self)
-        self.pytest_args = ['-n', 'auto']
+        try:
+            from multiprocessing import cpu_count
+            self.pytest_args = ['-n', str(cpu_count()), '--boxed']
+        except (ImportError, NotImplementedError):
+            self.pytest_args = ['-n', '1', '--boxed']
 
     def finalize_options(self):
         TestCommand.finalize_options(self)
@@ -43,62 +34,44 @@ class PyTest(TestCommand):
         errno = pytest.main(self.pytest_args)
         sys.exit(errno)
 
-
-class MyPyTest(TestCommand):
-    user_options = [('pytest-args=', 'a', "Arguments to pass into py.test")]
-
-    def initialize_options(self):
-        TestCommand.initialize_options(self)
-        self.pytest_args = ['-n', 'auto', '--mypy', 'tests']
-
-    def finalize_options(self):
-        TestCommand.finalize_options(self)
-        self.test_args = []
-        self.test_suite = True
-
-    def run_tests(self):
-        import pytest
-
-        errno = pytest.main(self.pytest_args)
-        sys.exit(errno)
-
-
 # 'setup.py publish' shortcut.
 if sys.argv[-1] == 'publish':
     os.system('python setup.py sdist bdist_wheel')
     os.system('twine upload dist/*')
     sys.exit()
+
+# pyOpenSSL version 18.0.0 dropped support for Python 2.6
+if sys.version_info < (2, 7):
+    PYOPENSSL_VERSION = 'pyOpenSSL >= 0.14, < 18.0.0'
+else:
+    PYOPENSSL_VERSION = 'pyOpenSSL >= 0.14'
+
 packages = ['requests']
+
 requires = [
     'chardet>=3.0.2,<3.1.0',
-    'idna>=2.5,<2.7',
-    'urllib3>=1.21.1,<1.23',
-    'certifi>=2017.4.17',
-    'rfc3986>=1.1.0<2',
-]
-test_requirements = [
-    'pytest-httpbin==0.0.7',
-    'pytest-cov',
-    'pytest-mock',
-    'pytest-xdist',
-    'PySocks>=1.5.6, !=1.5.7',
-    'pytest>=2.8.0',
-    'pytest-mypy',
-    'mypy',
-    'white',
+    'idna>=2.5,<2.8',
+    'urllib3>=1.21.1,<1.24',
+    'certifi>=2017.4.17'
+
 ]
+test_requirements = ['pytest-httpbin==0.0.7', 'pytest-cov', 'pytest-mock', 'pytest-xdist', 'PySocks>=1.5.6, !=1.5.7', 'pytest>=2.8.0']
+
 about = {}
 with open(os.path.join(here, 'requests', '__version__.py'), 'r', 'utf-8') as f:
-    exec (f.read(), about)
+    exec(f.read(), about)
+
 with open('README.rst', 'r', 'utf-8') as f:
     readme = f.read()
 with open('HISTORY.rst', 'r', 'utf-8') as f:
     history = f.read()
+
 setup(
     name=about['__title__'],
     version=about['__version__'],
     description=about['__description__'],
     long_description=readme + '\n\n' + history,
+    long_description_content_type='text/x-rst',
     author=about['__author__'],
     author_email=about['__author_email__'],
     url=about['__url__'],
@@ -106,6 +79,7 @@ setup(
     package_data={'': ['LICENSE', 'NOTICE'], 'requests': ['*.pem']},
     package_dir={'requests': 'requests'},
     include_package_data=True,
+    python_requires=">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
     install_requires=requires,
     license=about['__license__'],
     zip_safe=False,
@@ -115,20 +89,20 @@ setup(
         'Natural Language :: English',
         'License :: OSI Approved :: Apache Software License',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: Implementation :: CPython',
-        'Programming Language :: Python :: Implementation :: PyPy',
+        'Programming Language :: Python :: Implementation :: PyPy'
     ),
-    cmdclass={'test': PyTest, 'mypy': MyPyTest, 'format': Format},
+    cmdclass={'test': PyTest},
     tests_require=test_requirements,
     extras_require={
-        'security': ['pyOpenSSL>=0.14', 'cryptography>=1.3.4', 'idna>=2.0.0'],
+        'security': [PYOPENSSL_VERSION, 'cryptography>=1.3.4', 'idna>=2.0.0'],
         'socks': ['PySocks>=1.5.6, !=1.5.7'],
-        'socks:sys_platform == "win32" and python_version == "2.7"': [
-            'win_inet_pton'
-        ],
+        'socks:sys_platform == "win32" and (python_version == "2.7" or python_version == "2.6")': ['win_inet_pton'],
     },
 )

tests/__init__.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 """Requests test package initialisation."""
 
 import warnings

tests/compat.py

@@ -1,6 +1,21 @@
 # -*- coding: utf-8 -*-
-import io as StringIO
+
+from requests.compat import is_py3
 
 
-def u(s):
-    return s
+try:
+    import StringIO
+except ImportError:
+    import io as StringIO
+
+try:
+    from cStringIO import StringIO as cStringIO
+except ImportError:
+    cStringIO = None
+
+if is_py3:
+    def u(s):
+        return s
+else:
+    def u(s):
+        return s.decode('unicode-escape')

tests/conftest.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
+
 import pytest
-from urllib.parse import urljoin
+from requests.compat import urljoin
 
 
 def prepare_url(value):

tests/test_help.py

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8
+
 import sys
 
 import pytest
@@ -6,9 +7,7 @@ import pytest
 from requests.help import info
 
 
-@pytest.mark.skipif(
-    sys.version_info[:2] != (2, 6), reason="Only run on Python 2.6"
-)
+@pytest.mark.skipif(sys.version_info[:2] != (2,6), reason="Only run on Python 2.6")
 def test_system_ssl_py26():
     """OPENSSL_VERSION_NUMBER isn't provided in Python 2.6, verify we don't
     blow up in this case.
@@ -16,16 +15,13 @@ def test_system_ssl_py26():
     assert info()['system_ssl'] == {'version': ''}
 
 
-@pytest.mark.skipif(
-    sys.version_info < (2, 7), reason="Only run on Python 2.7+"
-)
+@pytest.mark.skipif(sys.version_info < (2,7), reason="Only run on Python 2.7+")
 def test_system_ssl():
     """Verify we're actually setting system_ssl when it should be available."""
     assert info()['system_ssl']['version'] != ''
 
 
 class VersionedPackage(object):
-
     def __init__(self, version):
         self.__version__ = version
 

tests/test_hooks.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 import pytest
 
 from requests import hooks
@@ -9,12 +10,13 @@ def hook(value):
 
 
 @pytest.mark.parametrize(
-    'hooks_list, result', ((hook, 'ata'), ([hook, lambda x: None, hook], 'ta'))
+    'hooks_list, result', (
+        (hook, 'ata'),
+        ([hook, lambda x: None, hook], 'ta'),
+    )
 )
 def test_hooks(hooks_list, result):
-    assert hooks.dispatch_hook(
-        'response', {'response': hooks_list}, 'Data'
-    ) == result
+    assert hooks.dispatch_hook('response', {'response': hooks_list}, 'Data') == result
 
 
 def test_default_hooks():

tests/test_lowlevel.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 import pytest
 import threading
 import requests
@@ -13,54 +14,39 @@ def test_chunked_upload():
     close_server = threading.Event()
     server = Server.basic_response_server(wait_to_close_event=close_server)
     data = iter([b'a', b'b', b'c'])
+
     with server as (host, port):
         url = 'http://{0}:{1}/'.format(host, port)
         r = requests.post(url, data=data, stream=True)
         close_server.set()  # release server block
+
     assert r.status_code == 200
     assert r.request.headers['Transfer-Encoding'] == 'chunked'
 
 
-def test_incorrect_content_length():
-    """Test ConnectionError raised for incomplete responses"""
-    close_server = threading.Event()
-    server = Server.text_response_server(
-        "HTTP/1.1 200 OK\r\n" + "Content-Length: 50\r\n\r\n" + "Hello World."
-    )
-    with server as (host, port):
-        url = 'http://{0}:{1}/'.format(host, port)
-        r = requests.Request('GET', url).prepare()
-        s = requests.Session()
-        with pytest.raises(requests.exceptions.ConnectionError) as e:
-            resp = s.send(r)
-        assert "12 bytes read, 38 more expected" in str(e)
-        close_server.set()  # release server block
-
-
 def test_digestauth_401_count_reset_on_redirect():
     """Ensure we correctly reset num_401_calls after a successful digest auth,
     followed by a 302 redirect to another digest auth prompt.
 
     See https://github.com/requests/requests/issues/1979.
     """
-    text_401 = (
-        b'HTTP/1.1 401 UNAUTHORIZED\r\n'
-        b'Content-Length: 0\r\n'
-        b'WWW-Authenticate: Digest nonce="6bf5d6e4da1ce66918800195d6b9130d"'
-        b', opaque="372825293d1c26955496c80ed6426e9e", '
-        b'realm="me@kennethreitz.com", qop=auth\r\n\r\n'
-    )
-    text_302 = (
-        b'HTTP/1.1 302 FOUND\r\n'
-        b'Content-Length: 0\r\n'
-        b'Location: /\r\n\r\n'
-    )
-    text_200 = (b'HTTP/1.1 200 OK\r\n' b'Content-Length: 0\r\n\r\n')
-    expected_digest = (
-        b'Authorization: Digest username="user", '
-        b'realm="me@kennethreitz.com", '
-        b'nonce="6bf5d6e4da1ce66918800195d6b9130d", uri="/"'
-    )
+    text_401 = (b'HTTP/1.1 401 UNAUTHORIZED\r\n'
+                b'Content-Length: 0\r\n'
+                b'WWW-Authenticate: Digest nonce="6bf5d6e4da1ce66918800195d6b9130d"'
+                b', opaque="372825293d1c26955496c80ed6426e9e", '
+                b'realm="me@kennethreitz.com", qop=auth\r\n\r\n')
+
+    text_302 = (b'HTTP/1.1 302 FOUND\r\n'
+                b'Content-Length: 0\r\n'
+                b'Location: /\r\n\r\n')
+
+    text_200 = (b'HTTP/1.1 200 OK\r\n'
+                b'Content-Length: 0\r\n\r\n')
+
+    expected_digest = (b'Authorization: Digest username="user", '
+                       b'realm="me@kennethreitz.com", '
+                       b'nonce="6bf5d6e4da1ce66918800195d6b9130d", uri="/"')
+
     auth = requests.auth.HTTPDigestAuth('user', 'pass')
 
     def digest_response_handler(sock):
@@ -68,23 +54,28 @@ def test_digestauth_401_count_reset_on_redirect():
         request_content = consume_socket_content(sock, timeout=0.5)
         assert request_content.startswith(b"GET / HTTP/1.1")
         sock.send(text_401)
+
         # Verify we receive an Authorization header in response, then redirect.
         request_content = consume_socket_content(sock, timeout=0.5)
         assert expected_digest in request_content
         sock.send(text_302)
+
         # Verify Authorization isn't sent to the redirected host,
         # then send another challenge.
         request_content = consume_socket_content(sock, timeout=0.5)
         assert b'Authorization:' not in request_content
         sock.send(text_401)
+
         # Verify Authorization is sent correctly again, and return 200 OK.
         request_content = consume_socket_content(sock, timeout=0.5)
         assert expected_digest in request_content
         sock.send(text_200)
+
         return request_content
 
     close_server = threading.Event()
     server = Server(digest_response_handler, wait_to_close_event=close_server)
+
     with server as (host, port):
         url = 'http://{0}:{1}/'.format(host, port)
         r = requests.get(url, auth=auth)
@@ -102,18 +93,16 @@ def test_digestauth_401_only_sent_once():
     """Ensure we correctly respond to a 401 challenge once, and then
     stop responding if challenged again.
     """
-    text_401 = (
-        b'HTTP/1.1 401 UNAUTHORIZED\r\n'
-        b'Content-Length: 0\r\n'
-        b'WWW-Authenticate: Digest nonce="6bf5d6e4da1ce66918800195d6b9130d"'
-        b', opaque="372825293d1c26955496c80ed6426e9e", '
-        b'realm="me@kennethreitz.com", qop=auth\r\n\r\n'
-    )
-    expected_digest = (
-        b'Authorization: Digest username="user", '
-        b'realm="me@kennethreitz.com", '
-        b'nonce="6bf5d6e4da1ce66918800195d6b9130d", uri="/"'
-    )
+    text_401 = (b'HTTP/1.1 401 UNAUTHORIZED\r\n'
+                b'Content-Length: 0\r\n'
+                b'WWW-Authenticate: Digest nonce="6bf5d6e4da1ce66918800195d6b9130d"'
+                b', opaque="372825293d1c26955496c80ed6426e9e", '
+                b'realm="me@kennethreitz.com", qop=auth\r\n\r\n')
+
+    expected_digest = (b'Authorization: Digest username="user", '
+                       b'realm="me@kennethreitz.com", '
+                       b'nonce="6bf5d6e4da1ce66918800195d6b9130d", uri="/"')
+
     auth = requests.auth.HTTPDigestAuth('user', 'pass')
 
     def digest_failed_response_handler(sock):
@@ -121,20 +110,22 @@ def test_digestauth_401_only_sent_once():
         request_content = consume_socket_content(sock, timeout=0.5)
         assert request_content.startswith(b"GET / HTTP/1.1")
         sock.send(text_401)
+
         # Verify we receive an Authorization header in response, then
         # challenge again.
         request_content = consume_socket_content(sock, timeout=0.5)
         assert expected_digest in request_content
         sock.send(text_401)
+
         # Verify the client didn't respond to second challenge.
         request_content = consume_socket_content(sock, timeout=0.5)
         assert request_content == b''
+
         return request_content
 
     close_server = threading.Event()
-    server = Server(
-        digest_failed_response_handler, wait_to_close_event=close_server
-    )
+    server = Server(digest_failed_response_handler, wait_to_close_event=close_server)
+
     with server as (host, port):
         url = 'http://{0}:{1}/'.format(host, port)
         r = requests.get(url, auth=auth)
@@ -149,13 +140,12 @@ def test_digestauth_only_on_4xx():
 
     See https://github.com/requests/requests/issues/3772.
     """
-    text_200_chal = (
-        b'HTTP/1.1 200 OK\r\n'
-        b'Content-Length: 0\r\n'
-        b'WWW-Authenticate: Digest nonce="6bf5d6e4da1ce66918800195d6b9130d"'
-        b', opaque="372825293d1c26955496c80ed6426e9e", '
-        b'realm="me@kennethreitz.com", qop=auth\r\n\r\n'
-    )
+    text_200_chal = (b'HTTP/1.1 200 OK\r\n'
+                     b'Content-Length: 0\r\n'
+                     b'WWW-Authenticate: Digest nonce="6bf5d6e4da1ce66918800195d6b9130d"'
+                     b', opaque="372825293d1c26955496c80ed6426e9e", '
+                     b'realm="me@kennethreitz.com", qop=auth\r\n\r\n')
+
     auth = requests.auth.HTTPDigestAuth('user', 'pass')
 
     def digest_response_handler(sock):
@@ -163,13 +153,16 @@ def test_digestauth_only_on_4xx():
         request_content = consume_socket_content(sock, timeout=0.5)
         assert request_content.startswith(b"GET / HTTP/1.1")
         sock.send(text_200_chal)
+
         # Verify the client didn't respond with auth.
         request_content = consume_socket_content(sock, timeout=0.5)
         assert request_content == b''
+
         return request_content
 
     close_server = threading.Event()
     server = Server(digest_response_handler, wait_to_close_event=close_server)
+
     with server as (host, port):
         url = 'http://{0}:{1}/'.format(host, port)
         r = requests.get(url, auth=auth)
@@ -180,20 +173,23 @@ def test_digestauth_only_on_4xx():
 
 
 _schemes_by_var_prefix = [
-    ('http', ['http']), ('https', ['https']), ('all', ['http', 'https'])
+    ('http', ['http']),
+    ('https', ['https']),
+    ('all', ['http', 'https']),
 ]
+
 _proxy_combos = []
 for prefix, schemes in _schemes_by_var_prefix:
     for scheme in schemes:
         _proxy_combos.append(("{0}_proxy".format(prefix), scheme))
+
 _proxy_combos += [(var.upper(), scheme) for var, scheme in _proxy_combos]
 
 
 @pytest.mark.parametrize("var,scheme", _proxy_combos)
 def test_use_proxy_from_environment(httpbin, var, scheme):
     url = "{0}://httpbin.org".format(scheme)
-    fake_proxy = Server(
-    )  # do nothing with the requests; just close the socket
+    fake_proxy = Server()  # do nothing with the requests; just close the socket
     with fake_proxy as (host, port):
         proxy_url = "socks5://{0}:{1}".format(host, port)
         kwargs = {var: proxy_url}
@@ -201,8 +197,10 @@ def test_use_proxy_from_environment(httpbin, var, scheme):
             # fake proxy's lack of response will cause a ConnectionError
             with pytest.raises(requests.exceptions.ConnectionError):
                 requests.get(url)
+
         # the fake proxy received a request
         assert len(fake_proxy.handler_results) == 1
+
         # it had actual content (not checking for SOCKS protocol for now)
         assert len(fake_proxy.handler_results[0]) > 0
 
@@ -226,14 +224,86 @@ def test_redirect_rfc1808_to_non_ascii_location():
 
     close_server = threading.Event()
     server = Server(redirect_resp_handler, wait_to_close_event=close_server)
+
     with server as (host, port):
         url = u'http://{0}:{1}'.format(host, port)
         r = requests.get(url=url, allow_redirects=True)
         assert r.status_code == 200
         assert len(r.history) == 1
         assert r.history[0].status_code == 301
-        assert redirect_request[0].startswith(
-            b'GET /' + expected_path + b' HTTP/1.1'
-        )
+        assert redirect_request[0].startswith(b'GET /' + expected_path + b' HTTP/1.1')
         assert r.url == u'{0}/{1}'.format(url, expected_path.decode('ascii'))
+
+        close_server.set()
+
+def test_fragment_not_sent_with_request():
+    """Verify that the fragment portion of a URI isn't sent to the server."""
+    def response_handler(sock):
+        req = consume_socket_content(sock, timeout=0.5)
+        sock.send(
+            b'HTTP/1.1 200 OK\r\n'
+            b'Content-Length: '+bytes(len(req))+b'\r\n'
+            b'\r\n'+req
+        )
+
+    close_server = threading.Event()
+    server = Server(response_handler, wait_to_close_event=close_server)
+
+    with server as (host, port):
+        url = 'http://{0}:{1}/path/to/thing/#view=edit&token=hunter2'.format(host, port)
+        r = requests.get(url)
+        raw_request = r.content
+
+        assert r.status_code == 200
+        headers, body = raw_request.split(b'\r\n\r\n', 1)
+        status_line, headers = headers.split(b'\r\n', 1)
+
+        assert status_line == b'GET /path/to/thing/ HTTP/1.1'
+        for frag in (b'view', b'edit', b'token', b'hunter2'):
+            assert frag not in headers
+            assert frag not in body
+
+        close_server.set()
+
+def test_fragment_update_on_redirect():
+    """Verify we only append previous fragment if one doesn't exist on new
+    location. If a new fragment is encounterd in a Location header, it should
+    be added to all subsequent requests.
+    """
+
+    def response_handler(sock):
+        consume_socket_content(sock, timeout=0.5)
+        sock.send(
+            b'HTTP/1.1 302 FOUND\r\n'
+            b'Content-Length: 0\r\n'
+            b'Location: /get#relevant-section\r\n\r\n'
+        )
+        consume_socket_content(sock, timeout=0.5)
+        sock.send(
+            b'HTTP/1.1 302 FOUND\r\n'
+            b'Content-Length: 0\r\n'
+            b'Location: /final-url/\r\n\r\n'
+        )
+        consume_socket_content(sock, timeout=0.5)
+        sock.send(
+            b'HTTP/1.1 200 OK\r\n\r\n'
+        )
+
+    close_server = threading.Event()
+    server = Server(response_handler, wait_to_close_event=close_server)
+
+    with server as (host, port):
+        url = 'http://{0}:{1}/path/to/thing/#view=edit&token=hunter2'.format(host, port)
+        r = requests.get(url)
+        raw_request = r.content
+
+        assert r.status_code == 200
+        assert len(r.history) == 2
+        assert r.history[0].request.url == url
+
+        # Verify we haven't overwritten the location with our previous fragment.
+        assert r.history[1].request.url == 'http://{0}:{1}/get#relevant-section'.format(host, port)
+        # Verify previous fragment is used and not the original.
+        assert r.url == 'http://{0}:{1}/final-url/#relevant-section'.format(host, port)
+
         close_server.set()

tests/test_packages.py

@@ -0,0 +1,13 @@
+import requests
+
+
+def test_can_access_urllib3_attribute():
+    requests.packages.urllib3
+
+
+def test_can_access_idna_attribute():
+    requests.packages.idna
+
+
+def test_can_access_chardet_attribute():
+    requests.packages.chardet

tests/test_structures.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
+
 import pytest
 
-from requests.structures import CaseInsensitiveDict, LookupDict, HTTPHeaderDict
-from urllib3._collections import HTTPHeaderDict as U3HeaderDict
+from requests.structures import CaseInsensitiveDict, LookupDict
 
 
 class TestCaseInsensitiveDict:
@@ -16,9 +16,7 @@ class TestCaseInsensitiveDict:
     def test_list(self):
         assert list(self.case_insensitive_dict) == ['Accept']
 
-    possible_keys = pytest.mark.parametrize(
-        'key', ('accept', 'ACCEPT', 'aCcEpT', 'Accept')
-    )
+    possible_keys = pytest.mark.parametrize('key', ('accept', 'ACCEPT', 'aCcEpT', 'Accept'))
 
     @possible_keys
     def test_getitem(self, key):
@@ -30,14 +28,10 @@ class TestCaseInsensitiveDict:
         assert key not in self.case_insensitive_dict
 
     def test_lower_items(self):
-        assert list(self.case_insensitive_dict.lower_items()) == [
-            ('accept', 'application/json')
-        ]
+        assert list(self.case_insensitive_dict.lower_items()) == [('accept', 'application/json')]
 
     def test_repr(self):
-        assert repr(
-            self.case_insensitive_dict
-        ) == "{'Accept': 'application/json'}"
+        assert repr(self.case_insensitive_dict) == "{'Accept': 'application/json'}"
 
     def test_copy(self):
         copy = self.case_insensitive_dict.copy()
@@ -45,186 +39,16 @@ class TestCaseInsensitiveDict:
         assert copy == self.case_insensitive_dict
 
     @pytest.mark.parametrize(
-        'other, result',
-        (({'AccePT': 'application/json'}, True), ({}, False), (None, False)),
+        'other, result', (
+            ({'AccePT': 'application/json'}, True),
+            ({}, False),
+            (None, False)
+        )
     )
     def test_instance_equality(self, other, result):
         assert (self.case_insensitive_dict == other) is result
 
 
-class TestHTTPHeaderDictCompatibility(TestCaseInsensitiveDict):
-    """HTTPHeaderDict should be completely compatible with CaseInsensitiveDict
-    when used for headers, so ensure that all the tests for the base class
-    also pass for this one."""
-
-    @pytest.fixture(autouse=True)
-    def setup(self):
-        self.case_insensitive_dict = HTTPHeaderDict()
-        self.case_insensitive_dict['Accept'] = 'application/json'
-
-
-class TestHTTPHeaderDict:
-
-    @pytest.fixture(autouse=True)
-    def setup(self):
-        self.kvs = [
-            ('animal', 'chicken'),
-            ('AnimaL', 'Cow'),
-            ('CAKE', 'Cheese!'),
-            ('Sauce', 'Bread'),
-            ('Sauce', 'Cherry, or Plum Tomato'),
-        ]
-        # HTTPHeaderDict from urllib3.
-        self.u3dict = ud = U3HeaderDict()
-        [ud.add(*tpl) for tpl in self.kvs]
-        # Regular dictionary.
-        self.ddict = dict(self.kvs)
-        self.ddict['Sauce'] = ['Bread!', 'Cherry, or Plum Tomato']
-        # Used by test_extend. All of these "extra" values are mostly
-        # equivalent to each other.
-        self.extra_hd = hd2 = HTTPHeaderDict(ANIMAL=['Dog', 'elephant'])
-        hd2['cake'] = 'Babka'
-        hd2.setlist('sound', ['quiet', 'LOUD'])
-        hd2['CUTLERY'] = 'fork'
-        self.extra_tuple_pairs = tuple_pairs = [
-            ('ANIMAL', 'Dog'),
-            ('Animal', 'elephant'),
-            ('cake', ['Babka']),
-            ('sound', 'quiet'),
-            ('sound', 'LOUD'),
-            ('CUTLERY', 'fork'),
-        ]
-        self.extra_simple_dict = dict(tuple_pairs)
-        self.extra_simple_dict['sound'] = ('quiet', 'LOUD')
-        self.extra_u3 = U3HeaderDict()
-        for k, v in tuple_pairs:
-            if isinstance(v, (tuple, list)):
-                for vi in v:
-                    self.extra_u3.add(k, vi)
-            else:
-                self.extra_u3.add(k, v)
-
-    def test_item_access(self):
-        hd = HTTPHeaderDict(self.kvs)
-        # Test that values are combined.
-        assert hd['Sauce'] == 'Bread, Cherry, or Plum Tomato'
-        assert hd['ANIMAL'] == 'chicken, Cow'
-        # Test we can overwrite values.
-        hd['animal'] = 'Goat!'
-        assert hd['anIMal'] == 'Goat!'
-        # Test deletion works.
-        del hd['sauce']
-        pytest.raises(KeyError, hd.__getitem__, 'sauce')
-        # Only string types allowed.
-        pytest.raises(ValueError, hd.__setitem__, 'cake', ['Cheese', 'sponge'])
-
-    def test_equality(self):
-        hd = HTTPHeaderDict(self.u3dict)
-        assert hd == self.u3dict
-        assert hd == HTTPHeaderDict(hd)
-        # Test that we still work even if we are comparing to a
-        # CaseInsensitiveDict instance.
-        cid = CaseInsensitiveDict(hd)
-        assert hd == cid
-        assert cid == hd
-
-    def test_lower_items(self):
-        hd = HTTPHeaderDict(self.kvs, cutlery='fork')
-        assert list(hd.lower_items()) == [
-            ('animal', 'chicken, Cow'),
-            ('cake', 'Cheese!'),
-            ('sauce', 'Bread, Cherry, or Plum Tomato'),
-            ('cutlery', 'fork'),
-        ]
-
-    def test_copy(self):
-        hd = HTTPHeaderDict(self.u3dict)
-        hd2 = hd.copy()
-        assert hd is not hd2
-        assert hd == hd2
-
-    def test_get_and_set_list(self):
-        hd = HTTPHeaderDict(self.kvs)
-        assert hd.getlist('SAUCE') == ['Bread', 'Cherry, or Plum Tomato']
-        assert hd.getlist('CAKE') == ['Cheese!']
-        assert hd.getlist('DRINK') == []
-        # Needs to be a regular sequence type containing just strings.
-        pytest.raises(ValueError, hd.setlist, 'Drink', 'Water')
-        pytest.raises(ValueError, hd.setlist, 'Drink', ['H', 2, 'O'])
-        # Test multi-setting.
-        hd.setlist('Drink', ['Water', 'Juice'])
-        assert hd.getlist('DRINK') == ['Water', 'Juice']
-        # Setting to an empty sequence should remove the entry.
-        hd.setlist('DRInk', [])
-        pytest.raises(KeyError, hd.__getitem__, 'DrinK')
-        assert hd.getlist('DRiNK') == []
-
-    def test_add(self):
-        hd = HTTPHeaderDict()
-        hd.add('sound', 'quiet')
-        hd.add('SOUND', 'LOUD')
-        assert hd.getlist('Sound') == ['quiet', 'LOUD']
-        # Enforce type-checking in the add method.
-        pytest.raises(ValueError, hd.add, 'Sound', 5)
-
-    @pytest.mark.parametrize(
-        'attr,as_arg,animal_arg_is_ordered',
-        [('extra_hd', True, True), ('extra_tuple_pairs', True, True), ('extra_simple_dict', True, False), ('extra_u3', True, False), ('extra_simple_dict', False, False)],
-        # These types will have the "animal" arguments in our preferred order.
-        # And these types will lose the ordering, so we can't make assertions
-        # about the final order of those values.
-    )
-    def test_extend(self, attr, as_arg, animal_arg_is_ordered):
-        item = getattr(self, attr)
-        # Call extend with the associated values - we should see all of the
-        # merged data in the HTTPHeaderDict instance.
-        extras = {'cutlery': 'knife'}
-        hd = HTTPHeaderDict(self.kvs)
-        if as_arg:
-            hd.extend(item, **extras)
-        else:
-            hd.extend(extras, **item)
-        # Test all the stored values are what we expect.
-        mget = hd.getlist
-        # Depending on the item we merged in, we might be able to make
-        # assumptions what the overall order of the structure is.
-        animal_seq = mget('animal')
-        if animal_arg_is_ordered:
-            assert animal_seq == ['chicken', 'Cow', 'Dog', 'elephant']
-        else:
-            # The existing order in HTTPHeadersDict of the first two values
-            # should be preserved - no guarantees in which order the other
-            # two values are added.
-            assert animal_seq in [
-                ['chicken', 'Cow', 'Dog', 'elephant'],
-                ['chicken', 'Cow', 'elephant', 'Dog'],
-            ]
-        assert mget('cake') == ['Cheese!', 'Babka']
-        assert mget('sound') == ['quiet', 'LOUD']
-        # We don't mandate the order in which these dictionaries are
-        # processed, so it's fine whichever order it is.
-        assert mget('cutlery') in [['fork', 'knife'], ['knife', 'fork']]
-
-    def test_extend_type_checking(self):
-        hd = HTTPHeaderDict()
-        pytest.raises(ValueError, hd.extend, dict(type=['xml', None, 'html']))
-
-    def test_repr(self):
-        hd = HTTPHeaderDict()
-        assert repr(hd) == '{}'
-        hd.add('type', 'xml')
-        assert repr(hd) == "{'type': 'xml'}"
-        hd.add('type', 'html')
-        assert repr(hd) == "{'type': ('xml', 'html')}"
-        # We can't guarantee order once we have more than one key.
-        hd.add('Accept', 'text/html')
-        assert repr(hd) in [
-            "{'type': ('xml', 'html'), 'Accept': 'text/html'}",
-            "{'Accept': 'text/html', 'type': ('xml', 'html')}",
-        ]
-        assert str(hd) == repr(hd)
-
-
 class TestLookupDict:
 
     @pytest.fixture(autouse=True)
@@ -237,7 +61,10 @@ class TestLookupDict:
         assert repr(self.lookup_dict) == "<lookup 'test'>"
 
     get_item_parameters = pytest.mark.parametrize(
-        'key, value', (('bad_gateway', 502), ('not_a_key', None))
+        'key, value', (
+            ('bad_gateway', 502),
+            ('not_a_key', None)
+        )
     )
 
     @get_item_parameters

tests/test_testserver.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 import threading
 import socket
 import time
@@ -33,7 +34,9 @@ class TestTestServer:
         with Server.basic_response_server() as (host, port):
             sock = socket.socket()
             sock.connect((host, port))
+
             sock.close()
+
         with pytest.raises(socket.error):
             new_sock = socket.socket()
             new_sock.connect((host, port))
@@ -41,10 +44,14 @@ class TestTestServer:
     def test_text_response(self):
         """the text_response_server sends the given text"""
         server = Server.text_response_server(
-            "HTTP/1.1 200 OK\r\n" + "Content-Length: 6\r\n" + "\r\nroflol"
+            "HTTP/1.1 200 OK\r\n" +
+            "Content-Length: 6\r\n" +
+            "\r\nroflol"
         )
+
         with server as (host, port):
             r = requests.get('http://{0}:{1}'.format(host, port))
+
             assert r.status_code == 200
             assert r.text == u'roflol'
             assert r.headers['Content-Length'] == '6'
@@ -60,11 +67,8 @@ class TestTestServer:
     def test_basic_waiting_server(self):
         """the server waits for the block_server event to be set before closing"""
         block_server = threading.Event()
-        with Server.basic_response_server(
-            wait_to_close_event=block_server
-        ) as (
-            host, port
-        ):
+
+        with Server.basic_response_server(wait_to_close_event=block_server) as (host, port):
             sock = socket.socket()
             sock.connect((host, port))
             sock.sendall(b'send something')
@@ -75,60 +79,67 @@ class TestTestServer:
     def test_multiple_requests(self):
         """multiple requests can be served"""
         requests_to_handle = 5
-        server = Server.basic_response_server(
-            requests_to_handle=requests_to_handle
-        )
+
+        server = Server.basic_response_server(requests_to_handle=requests_to_handle)
+
         with server as (host, port):
             server_url = 'http://{0}:{1}'.format(host, port)
             for _ in range(requests_to_handle):
                 r = requests.get(server_url)
                 assert r.status_code == 200
+
             # the (n+1)th request fails
             with pytest.raises(requests.exceptions.ConnectionError):
                 r = requests.get(server_url)
 
-    @pytest.mark.skip(
-        reason="this fails non-deterministically under pytest-xdist"
-    )
+    @pytest.mark.skip(reason="this fails non-deterministically under pytest-xdist")
     def test_request_recovery(self):
         """can check the requests content"""
         # TODO: figure out why this sometimes fails when using pytest-xdist.
         server = Server.basic_response_server(requests_to_handle=2)
         first_request = b'put your hands up in the air'
         second_request = b'put your hand down in the floor'
+
         with server as address:
             sock1 = socket.socket()
             sock2 = socket.socket()
+
             sock1.connect(address)
             sock1.sendall(first_request)
             sock1.close()
+
             sock2.connect(address)
             sock2.sendall(second_request)
             sock2.close()
+
         assert server.handler_results[0] == first_request
         assert server.handler_results[1] == second_request
 
     def test_requests_after_timeout_are_not_received(self):
         """the basic response handler times out when receiving requests"""
         server = Server.basic_response_server(request_timeout=1)
+
         with server as address:
             sock = socket.socket()
             sock.connect(address)
             time.sleep(1.5)
             sock.sendall(b'hehehe, not received')
             sock.close()
+
         assert server.handler_results[0] == b''
 
     def test_request_recovery_with_bigger_timeout(self):
         """a biggest timeout can be specified"""
         server = Server.basic_response_server(request_timeout=3)
         data = b'bananadine'
+
         with server as address:
             sock = socket.socket()
             sock.connect(address)
             time.sleep(1.5)
             sock.sendall(data)
             sock.close()
+
         assert server.handler_results[0] == data
 
     def test_server_finishes_on_error(self):
@@ -140,16 +151,16 @@ class TestTestServer:
 
         assert len(server.handler_results) == 0
 
+        # if the server thread fails to finish, the test suite will hang
+        # and get killed by the jenkins timeout.
 
-    # if the server thread fails to finish, the test suite will hang
-    # and get killed by the jenkins timeout.
     def test_server_finishes_when_no_connections(self):
         """the server thread exits even if there are no connections"""
         server = Server.basic_response_server()
         with server:
             pass
+
         assert len(server.handler_results) == 0
 
-
-# if the server thread fails to finish, the test suite will hang
-# and get killed by the jenkins timeout.
+        # if the server thread fails to finish, the test suite will hang
+        # and get killed by the jenkins timeout.

tests/test_utils.py

@@ -1,48 +1,40 @@
 # -*- coding: utf-8 -*-
+
 import os
 import copy
+import filecmp
 from io import BytesIO
+import zipfile
+from collections import deque
 
 import pytest
-from requests import basics
+from requests import compat
 from requests.cookies import RequestsCookieJar
 from requests.structures import CaseInsensitiveDict
 from requests.utils import (
-    address_in_network,
-    dotted_netmask,
-    get_auth_from_url,
-    get_encoding_from_headers,
-    get_encodings_from_content,
-    get_environ_proxies,
-    guess_filename,
-    guess_json_utf,
-    is_ipv4_address,
-    is_valid_cidr,
-    iter_slices,
-    parse_dict_header,
-    parse_header_links,
-    prepend_scheme_if_needed,
-    requote_uri,
-    select_proxy,
-    should_bypass_proxies,
-    super_len,
-    to_key_val_list,
-    unquote_header_value,
-    unquote_unreserved,
-    urldefragauth,
-    add_dict_to_cookiejar,
-    set_environ,
-)
+    address_in_network, dotted_netmask, extract_zipped_paths,
+    get_auth_from_url, _parse_content_type_header, get_encoding_from_headers,
+    get_encodings_from_content, get_environ_proxies,
+    guess_filename, guess_json_utf, is_ipv4_address,
+    is_valid_cidr, iter_slices, parse_dict_header,
+    parse_header_links, prepend_scheme_if_needed,
+    requote_uri, select_proxy, should_bypass_proxies, super_len,
+    to_key_val_list, to_native_string,
+    unquote_header_value, unquote_unreserved,
+    urldefragauth, add_dict_to_cookiejar, set_environ)
 from requests._internal_utils import unicode_is_ascii
 
-from .compat import StringIO
+from .compat import StringIO, cStringIO
 
 
 class TestSuperLen:
 
     @pytest.mark.parametrize(
-        'stream, value', ((StringIO.StringIO, 'Test'), (BytesIO, b'Test'))
-    )
+        'stream, value', (
+            (StringIO.StringIO, 'Test'),
+            (BytesIO, b'Test'),
+            pytest.mark.skipif('cStringIO is None')((cStringIO, 'Test')),
+        ))
     def test_io_streams(self, stream, value):
         """Ensures that we properly deal with different kinds of IO streams."""
         assert super_len(stream()) == 0
@@ -57,9 +49,7 @@ class TestSuperLen:
     @pytest.mark.parametrize('error', [IOError, OSError])
     def test_super_len_handles_files_raising_weird_errors_in_tell(self, error):
         """If tell() raises errors, assume the cursor is at position zero."""
-
         class BoomFile(object):
-
             def __len__(self):
                 return 5
 
@@ -71,9 +61,7 @@ class TestSuperLen:
     @pytest.mark.parametrize('error', [IOError, OSError])
     def test_super_len_tell_ioerror(self, error):
         """Ensure that if tell gives an IOError super_len doesn't fail"""
-
         class NoLenBoomFile(object):
-
             def tell(self):
                 raise error()
 
@@ -85,7 +73,11 @@ class TestSuperLen:
     def test_string(self):
         assert super_len('Test') == 4
 
-    @pytest.mark.parametrize('mode, warnings_num', (('r', 1), ('rb', 0)))
+    @pytest.mark.parametrize(
+        'mode, warnings_num', (
+            ('r', 1),
+            ('rb', 0),
+        ))
     def test_file(self, tmpdir, mode, warnings_num, recwarn):
         file_obj = tmpdir.join('test.txt')
         file_obj.write('Test')
@@ -94,14 +86,12 @@ class TestSuperLen:
         assert len(recwarn) == warnings_num
 
     def test_super_len_with__len__(self):
-        foo = [1, 2, 3, 4]
+        foo = [1,2,3,4]
         len_foo = super_len(foo)
         assert len_foo == 4
 
     def test_super_len_with_no__len__(self):
-
         class LenFile(object):
-
             def __init__(self):
                 self.len = 5
 
@@ -127,14 +117,12 @@ class TestSuperLen:
 class TestToKeyValList:
 
     @pytest.mark.parametrize(
-        'value, expected',
-        (
+        'value, expected', (
             ([('key', 'val')], [('key', 'val')]),
-            ((('key', 'val'),), [('key', 'val')]),
+            ((('key', 'val'), ), [('key', 'val')]),
             ({'key': 'val'}, [('key', 'val')]),
-            (None, None),
-        ),
-    )
+            (None, None)
+        ))
     def test_valid(self, value, expected):
         assert to_key_val_list(value) == expected
 
@@ -146,15 +134,13 @@ class TestToKeyValList:
 class TestUnquoteHeaderValue:
 
     @pytest.mark.parametrize(
-        'value, expected',
-        (
+        'value, expected', (
             (None, None),
             ('Test', 'Test'),
             ('"Test"', 'Test'),
             ('"Test\\\\"', 'Test\\'),
             ('"\\\\Comp\\Res"', '\\Comp\\Res'),
-        ),
-    )
+        ))
     def test_valid(self, value, expected):
         assert unquote_header_value(value) == expected
 
@@ -169,57 +155,46 @@ class TestGetEnvironProxies:
 
     @pytest.fixture(autouse=True, params=['no_proxy', 'NO_PROXY'])
     def no_proxy(self, request, monkeypatch):
-        monkeypatch.setenv(
-            request.param,
-            '192.168.0.0/24,127.0.0.1,localhost.localdomain,172.16.1.1',
-        )
+        monkeypatch.setenv(request.param, '192.168.0.0/24,127.0.0.1,localhost.localdomain,172.16.1.1')
 
     @pytest.mark.parametrize(
-        'url',
-        (
+        'url', (
             'http://192.168.0.1:5000/',
             'http://192.168.0.1/',
             'http://172.16.1.1/',
             'http://172.16.1.1:5000/',
             'http://localhost.localdomain:5000/v1.0/',
-        ),
-    )
+        ))
     def test_bypass(self, url):
         assert get_environ_proxies(url, no_proxy=None) == {}
 
     @pytest.mark.parametrize(
-        'url',
-        (
+        'url', (
             'http://192.168.1.1:5000/',
             'http://192.168.1.1/',
             'http://www.requests.com/',
-        ),
-    )
+        ))
     def test_not_bypass(self, url):
         assert get_environ_proxies(url, no_proxy=None) != {}
 
     @pytest.mark.parametrize(
-        'url',
-        (
+        'url', (
             'http://192.168.1.1:5000/',
             'http://192.168.1.1/',
             'http://www.requests.com/',
-        ),
-    )
+        ))
     def test_bypass_no_proxy_keyword(self, url):
         no_proxy = '192.168.1.1,requests.com'
         assert get_environ_proxies(url, no_proxy=no_proxy) == {}
 
     @pytest.mark.parametrize(
-        'url',
-        (
+        'url', (
             'http://192.168.0.1:5000/',
             'http://192.168.0.1/',
             'http://172.16.1.1/',
             'http://172.16.1.1:5000/',
             'http://localhost.localdomain:5000/v1.0/',
-        ),
-    )
+        ))
     def test_not_bypass_no_proxy_keyword(self, url, monkeypatch):
         # This is testing that the 'no_proxy' argument overrides the
         # environment variable 'no_proxy'
@@ -244,15 +219,13 @@ class TestIsValidCIDR:
         assert is_valid_cidr('192.168.1.0/24')
 
     @pytest.mark.parametrize(
-        'value',
-        (
+        'value', (
             '8.8.8.8',
             '192.168.1.0/a',
             '192.168.1.0/128',
             '192.168.1.0/-1',
             '192.168.1.999/24',
-        ),
-    )
+        ))
     def test_invalid(self, value):
         assert not is_valid_cidr(value)
 
@@ -269,15 +242,16 @@ class TestAddressInNetwork:
 class TestGuessFilename:
 
     @pytest.mark.parametrize(
-        'value', (1, type('Fake', (object,), {'name': 1})())
+        'value', (1, type('Fake', (object,), {'name': 1})()),
     )
     def test_guess_filename_invalid(self, value):
         assert guess_filename(value) is None
 
     @pytest.mark.parametrize(
-        'value, expected_type',
-        ((b'value', basics.bytes), (b'value'.decode('utf-8'), basics.str)),
-    )
+        'value, expected_type', (
+            (b'value', compat.bytes),
+            (b'value'.decode('utf-8'), compat.str)
+        ))
     def test_guess_filename_valid(self, value, expected_type):
         obj = type('Fake', (object,), {'name': value})()
         result = guess_filename(obj)
@@ -285,6 +259,32 @@ class TestGuessFilename:
         assert isinstance(result, expected_type)
 
 
+class TestExtractZippedPaths:
+
+    @pytest.mark.parametrize(
+        'path', (
+            '/',
+            __file__,
+            pytest.__file__,
+            '/etc/invalid/location',
+        ))
+    def test_unzipped_paths_unchanged(self, path):
+        assert path == extract_zipped_paths(path)
+
+    def test_zipped_paths_extracted(self, tmpdir):
+        zipped_py = tmpdir.join('test.zip')
+        with zipfile.ZipFile(zipped_py.strpath, 'w') as f:
+            f.write(__file__)
+
+        _, name = os.path.splitdrive(__file__)
+        zipped_path = os.path.join(zipped_py.strpath, name.lstrip(r'\/'))
+        extracted_path = extract_zipped_paths(zipped_path)
+
+        assert extracted_path != zipped_path
+        assert os.path.exists(extracted_path)
+        assert filecmp.cmp(extracted_path, __file__)
+
+
 class TestContentEncodingDetection:
 
     def test_none(self):
@@ -292,13 +292,16 @@ class TestContentEncodingDetection:
         assert not len(encodings)
 
     @pytest.mark.parametrize(
-        'content',
-        ('<meta charset="UTF-8">', '<meta http-equiv="Content-type" content="text/html;charset=UTF-8">', '<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />', '<?xml version="1.0" encoding="UTF-8"?>'),
-        # HTML5 meta charset attribute
-        # HTML4 pragma directive
-        # XHTML 1.x served with text/html MIME type
-        # XHTML 1.x served as XML
-    )
+        'content', (
+            # HTML5 meta charset attribute
+            '<meta charset="UTF-8">',
+            # HTML4 pragma directive
+            '<meta http-equiv="Content-type" content="text/html;charset=UTF-8">',
+            # XHTML 1.x served with text/html MIME type
+            '<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />',
+            # XHTML 1.x served as XML
+            '<?xml version="1.0" encoding="UTF-8"?>',
+        ))
     def test_pragmas(self, content):
         encodings = get_encodings_from_content(content)
         assert len(encodings) == 1
@@ -309,26 +312,17 @@ class TestContentEncodingDetection:
         <?xml version="1.0" encoding="XML"?>
         <meta charset="HTML5">
         <meta http-equiv="Content-type" content="text/html;charset=HTML4" />
-        '''.strip(
-        )
+        '''.strip()
         assert get_encodings_from_content(content) == ['HTML5', 'HTML4', 'XML']
 
 
 class TestGuessJSONUTF:
 
     @pytest.mark.parametrize(
-        'encoding',
-        (
-            'utf-32',
-            'utf-8-sig',
-            'utf-16',
-            'utf-8',
-            'utf-16-be',
-            'utf-16-le',
-            'utf-32-be',
-            'utf-32-le',
-        ),
-    )
+        'encoding', (
+            'utf-32', 'utf-8-sig', 'utf-16', 'utf-8', 'utf-16-be', 'utf-16-le',
+            'utf-32-be', 'utf-32-le'
+        ))
     def test_encoded(self, encoding):
         data = '{}'.encode(encoding)
         assert guess_json_utf(data) == encoding
@@ -337,154 +331,212 @@ class TestGuessJSONUTF:
         assert guess_json_utf(b'\x00\x00\x00\x00') is None
 
     @pytest.mark.parametrize(
-        ('encoding', 'expected'),
-        (
+        ('encoding', 'expected'), (
             ('utf-16-be', 'utf-16'),
             ('utf-16-le', 'utf-16'),
             ('utf-32-be', 'utf-32'),
-            ('utf-32-le', 'utf-32'),
-        ),
-    )
+            ('utf-32-le', 'utf-32')
+        ))
     def test_guess_by_bom(self, encoding, expected):
         data = u'\ufeff{}'.encode(encoding)
         assert guess_json_utf(data) == expected
 
 
 USER = PASSWORD = "%!*'();:@&=+$,/?#[] "
-ENCODED_USER = basics.quote(USER, '')
-ENCODED_PASSWORD = basics.quote(PASSWORD, '')
+ENCODED_USER = compat.quote(USER, '')
+ENCODED_PASSWORD = compat.quote(PASSWORD, '')
 
 
 @pytest.mark.parametrize(
-    'url, auth',
-    (
+    'url, auth', (
         (
-            'http://' +
-            ENCODED_USER +
-            ':' +
-            ENCODED_PASSWORD +
-            '@' +
+            'http://' + ENCODED_USER + ':' + ENCODED_PASSWORD + '@' +
             'request.com/url.html#test',
-            (USER, PASSWORD),
+            (USER, PASSWORD)
+        ),
+        (
+            'http://user:pass@complex.url.com/path?query=yes',
+            ('user', 'pass')
         ),
-        ('http://user:pass@complex.url.com/path?query=yes', ('user', 'pass')),
         (
             'http://user:pass%20pass@complex.url.com/path?query=yes',
-            ('user', 'pass pass'),
+            ('user', 'pass pass')
         ),
         (
             'http://user:pass pass@complex.url.com/path?query=yes',
-            ('user', 'pass pass'),
+            ('user', 'pass pass')
         ),
         (
             'http://user%25user:pass@complex.url.com/path?query=yes',
-            ('user%user', 'pass'),
+            ('user%user', 'pass')
         ),
         (
             'http://user:pass%23pass@complex.url.com/path?query=yes',
-            ('user', 'pass#pass'),
+            ('user', 'pass#pass')
         ),
-        ('http://complex.url.com/path?query=yes', ('', '')),
-    ),
-)
+        (
+            'http://complex.url.com/path?query=yes',
+            ('', '')
+        ),
+    ))
 def test_get_auth_from_url(url, auth):
     assert get_auth_from_url(url) == auth
 
 
 @pytest.mark.parametrize(
-    'uri, expected',
-    (('http://example.com/fiz?buz=%25ppicture', 'http://example.com/fiz?buz=%25ppicture'), ('http://example.com/fiz?buz=%ppicture', 'http://example.com/fiz?buz=%25ppicture')),
-    # Ensure requoting doesn't break expectations
-    # Ensure we handle unquoted percent signs in redirects
-)
+    'uri, expected', (
+        (
+            # Ensure requoting doesn't break expectations
+            'http://example.com/fiz?buz=%25ppicture',
+            'http://example.com/fiz?buz=%25ppicture',
+        ),
+        (
+            # Ensure we handle unquoted percent signs in redirects
+            'http://example.com/fiz?buz=%ppicture',
+            'http://example.com/fiz?buz=%25ppicture',
+        ),
+    ))
 def test_requote_uri_with_unquoted_percents(uri, expected):
     """See: https://github.com/requests/requests/issues/2356"""
     assert requote_uri(uri) == expected
 
 
 @pytest.mark.parametrize(
-    'uri, expected',
-    (('http://example.com/?a=%--', 'http://example.com/?a=%--'), ('http://example.com/?a=%300', 'http://example.com/?a=00')),
-    # Illegal bytes
-    # Reserved characters
-)
+    'uri, expected', (
+        (
+            # Illegal bytes
+            'http://example.com/?a=%--',
+            'http://example.com/?a=%--',
+        ),
+        (
+            # Reserved characters
+            'http://example.com/?a=%300',
+            'http://example.com/?a=00',
+        )
+    ))
 def test_unquote_unreserved(uri, expected):
     assert unquote_unreserved(uri) == expected
 
 
 @pytest.mark.parametrize(
-    'mask, expected',
-    ((8, '255.0.0.0'), (24, '255.255.255.0'), (25, '255.255.255.128')),
-)
+    'mask, expected', (
+        (8, '255.0.0.0'),
+        (24, '255.255.255.0'),
+        (25, '255.255.255.128'),
+    ))
 def test_dotted_netmask(mask, expected):
     assert dotted_netmask(mask) == expected
 
 
-http_proxies = {
-    'http': 'http://http.proxy', 'http://some.host': 'http://some.host.proxy'
-}
-all_proxies = {
-    'all': 'socks5://http.proxy', 'all://some.host': 'socks5://some.host.proxy'
-}
-mixed_proxies = {
-    'http': 'http://http.proxy',
-    'http://some.host': 'http://some.host.proxy',
-    'all': 'socks5://http.proxy',
-}
-
-
+http_proxies = {'http': 'http://http.proxy',
+                'http://some.host': 'http://some.host.proxy'}
+all_proxies = {'all': 'socks5://http.proxy',
+               'all://some.host': 'socks5://some.host.proxy'}
+mixed_proxies = {'http': 'http://http.proxy',
+                 'http://some.host': 'http://some.host.proxy',
+                 'all': 'socks5://http.proxy'}
 @pytest.mark.parametrize(
-    'url, expected, proxies',
-    (('hTTp://u:p@Some.Host/path', 'http://some.host.proxy', http_proxies), ('hTTp://u:p@Other.Host/path', 'http://http.proxy', http_proxies), ('hTTp:///path', 'http://http.proxy', http_proxies), ('hTTps://Other.Host', None, http_proxies), ('file:///etc/motd', None, http_proxies), ('hTTp://u:p@Some.Host/path', 'socks5://some.host.proxy', all_proxies), ('hTTp://u:p@Other.Host/path', 'socks5://http.proxy', all_proxies), ('hTTp:///path', 'socks5://http.proxy', all_proxies), ('hTTps://Other.Host', 'socks5://http.proxy', all_proxies), ('http://u:p@other.host/path', 'http://http.proxy', mixed_proxies), ('http://u:p@some.host/path', 'http://some.host.proxy', mixed_proxies), ('https://u:p@other.host/path', 'socks5://http.proxy', mixed_proxies), ('https://u:p@some.host/path', 'socks5://http.proxy', mixed_proxies), ('https://', 'socks5://http.proxy', mixed_proxies), ('file:///etc/motd', 'socks5://http.proxy', all_proxies)),
-    # XXX: unsure whether this is reasonable behavior
-)
+    'url, expected, proxies', (
+        ('hTTp://u:p@Some.Host/path', 'http://some.host.proxy', http_proxies),
+        ('hTTp://u:p@Other.Host/path', 'http://http.proxy', http_proxies),
+        ('hTTp:///path', 'http://http.proxy', http_proxies),
+        ('hTTps://Other.Host', None, http_proxies),
+        ('file:///etc/motd', None, http_proxies),
+
+        ('hTTp://u:p@Some.Host/path', 'socks5://some.host.proxy', all_proxies),
+        ('hTTp://u:p@Other.Host/path', 'socks5://http.proxy', all_proxies),
+        ('hTTp:///path', 'socks5://http.proxy', all_proxies),
+        ('hTTps://Other.Host', 'socks5://http.proxy', all_proxies),
+
+        ('http://u:p@other.host/path', 'http://http.proxy', mixed_proxies),
+        ('http://u:p@some.host/path', 'http://some.host.proxy', mixed_proxies),
+        ('https://u:p@other.host/path', 'socks5://http.proxy', mixed_proxies),
+        ('https://u:p@some.host/path', 'socks5://http.proxy', mixed_proxies),
+        ('https://', 'socks5://http.proxy', mixed_proxies),
+        # XXX: unsure whether this is reasonable behavior
+        ('file:///etc/motd', 'socks5://http.proxy', all_proxies),
+    ))
 def test_select_proxies(url, expected, proxies):
     """Make sure we can select per-host proxies correctly."""
     assert select_proxy(url, proxies) == expected
 
 
 @pytest.mark.parametrize(
-    'value, expected',
-    (
-        (
-            'foo="is a fish", bar="as well"',
-            {'foo': 'is a fish', 'bar': 'as well'},
-        ),
-        ('key_without_value', {'key_without_value': None}),
-    ),
-)
+    'value, expected', (
+        ('foo="is a fish", bar="as well"', {'foo': 'is a fish', 'bar': 'as well'}),
+        ('key_without_value', {'key_without_value': None})
+    ))
 def test_parse_dict_header(value, expected):
     assert parse_dict_header(value) == expected
 
 
 @pytest.mark.parametrize(
-    'value, expected',
-    (
-        (CaseInsensitiveDict(), None),
+    'value, expected', (
         (
-            CaseInsensitiveDict(
-                {'content-type': 'application/json; charset=utf-8'}
-            ),
-            'utf-8',
+            'application/xml',
+            ('application/xml', {})
         ),
-        (CaseInsensitiveDict({'content-type': 'text/plain'}), 'ISO-8859-1'),
-    ),
-)
+        (
+            'application/json ; charset=utf-8',
+            ('application/json', {'charset': 'utf-8'})
+        ),
+        (
+            'text/plain',
+            ('text/plain', {})
+        ),
+        (
+            'multipart/form-data; boundary = something ; boundary2=\'something_else\' ; no_equals ',
+            ('multipart/form-data', {'boundary': 'something', 'boundary2': 'something_else', 'no_equals': True})
+        ),
+        (
+                'multipart/form-data; boundary = something ; boundary2="something_else" ; no_equals ',
+                ('multipart/form-data', {'boundary': 'something', 'boundary2': 'something_else', 'no_equals': True})
+        ),
+        (
+            'multipart/form-data; boundary = something ; \'boundary2=something_else\' ; no_equals ',
+            ('multipart/form-data', {'boundary': 'something', 'boundary2': 'something_else', 'no_equals': True})
+        ),
+        (
+            'multipart/form-data; boundary = something ; "boundary2=something_else" ; no_equals ',
+            ('multipart/form-data', {'boundary': 'something', 'boundary2': 'something_else', 'no_equals': True})
+        ),
+        (
+            'application/json ; ; ',
+            ('application/json', {})
+        )
+    ))
+def test__parse_content_type_header(value, expected):
+    assert _parse_content_type_header(value) == expected
+
+
+@pytest.mark.parametrize(
+    'value, expected', (
+        (
+            CaseInsensitiveDict(),
+            None
+        ),
+        (
+            CaseInsensitiveDict({'content-type': 'application/json; charset=utf-8'}),
+            'utf-8'
+        ),
+        (
+            CaseInsensitiveDict({'content-type': 'text/plain'}),
+            'ISO-8859-1'
+        ),
+    ))
 def test_get_encoding_from_headers(value, expected):
     assert get_encoding_from_headers(value) == expected
 
 
 @pytest.mark.parametrize(
-    'value, length',
-    (
+    'value, length', (
         ('', 0),
         ('T', 1),
         ('Test', 4),
         ('Cont', 0),
         ('Other', -5),
         ('Content', None),
-    ),
-)
+    ))
 def test_iter_slices(value, length):
     if length is None or (length <= 0 and len(value) > 0):
         # Reads all content at once
@@ -494,124 +546,148 @@ def test_iter_slices(value, length):
 
 
 @pytest.mark.parametrize(
-    'value, expected',
-    (
+    'value, expected', (
         (
             '<http:/.../front.jpeg>; rel=front; type="image/jpeg"',
-            [
-                {
-                    'url': 'http:/.../front.jpeg',
-                    'rel': 'front',
-                    'type': 'image/jpeg',
-                }
-            ],
+            [{'url': 'http:/.../front.jpeg', 'rel': 'front', 'type': 'image/jpeg'}]
+        ),
+        (
+            '<http:/.../front.jpeg>',
+            [{'url': 'http:/.../front.jpeg'}]
+        ),
+        (
+            '<http:/.../front.jpeg>;',
+            [{'url': 'http:/.../front.jpeg'}]
         ),
-        ('<http:/.../front.jpeg>', [{'url': 'http:/.../front.jpeg'}]),
-        ('<http:/.../front.jpeg>;', [{'url': 'http:/.../front.jpeg'}]),
         (
             '<http:/.../front.jpeg>; type="image/jpeg",<http://.../back.jpeg>;',
             [
                 {'url': 'http:/.../front.jpeg', 'type': 'image/jpeg'},
-                {'url': 'http://.../back.jpeg'},
-            ],
+                {'url': 'http://.../back.jpeg'}
+            ]
         ),
-        ('', []),
-    ),
-)
+        (
+            '',
+            []
+        ),
+    ))
 def test_parse_header_links(value, expected):
     assert parse_header_links(value) == expected
 
 
 @pytest.mark.parametrize(
-    'value, expected',
-    (
+    'value, expected', (
         ('example.com/path', 'http://example.com/path'),
         ('//example.com/path', 'http://example.com/path'),
-    ),
-)
+    ))
 def test_prepend_scheme_if_needed(value, expected):
     assert prepend_scheme_if_needed(value, 'http') == expected
 
 
 @pytest.mark.parametrize(
-    'url, expected',
-    (
-        (
-            'http://u:p@example.com/path?a=1#test',
-            'http://example.com/path?a=1',
-        ),
+    'value, expected', (
+        ('T', 'T'),
+        (b'T', 'T'),
+        (u'T', 'T'),
+    ))
+def test_to_native_string(value, expected):
+    assert to_native_string(value) == expected
+
+
+@pytest.mark.parametrize(
+    'url, expected', (
+        ('http://u:p@example.com/path?a=1#test', 'http://example.com/path?a=1'),
         ('http://example.com/path', 'http://example.com/path'),
         ('//u:p@example.com/path', '//example.com/path'),
         ('//example.com/path', '//example.com/path'),
         ('example.com/path', '//example.com/path'),
         ('scheme:u:p@example.com/path', 'scheme://example.com/path'),
-    ),
-)
+    ))
 def test_urldefragauth(url, expected):
     assert urldefragauth(url) == expected
 
 
 @pytest.mark.parametrize(
-    'url, expected',
-    (
-        ('http://192.168.0.1:5000/', True),
-        ('http://192.168.0.1/', True),
-        ('http://172.16.1.1/', True),
-        ('http://172.16.1.1:5000/', True),
-        ('http://localhost.localdomain:5000/v1.0/', True),
-        ('http://172.16.1.12/', False),
-        ('http://172.16.1.12:5000/', False),
-        ('http://google.com:5000/v1.0/', False),
-    ),
-)
+    'url, expected', (
+            ('http://192.168.0.1:5000/', True),
+            ('http://192.168.0.1/', True),
+            ('http://172.16.1.1/', True),
+            ('http://172.16.1.1:5000/', True),
+            ('http://localhost.localdomain:5000/v1.0/', True),
+            ('http://google.com:6000/', True),
+            ('http://172.16.1.12/', False),
+            ('http://172.16.1.12:5000/', False),
+            ('http://google.com:5000/v1.0/', False),
+    ))
 def test_should_bypass_proxies(url, expected, monkeypatch):
     """Tests for function should_bypass_proxies to check if proxy
     can be bypassed or not
     """
-    monkeypatch.setenv(
-        'no_proxy', '192.168.0.0/24,127.0.0.1,localhost.localdomain,172.16.1.1'
-    )
-    monkeypatch.setenv(
-        'NO_PROXY', '192.168.0.0/24,127.0.0.1,localhost.localdomain,172.16.1.1'
-    )
+    monkeypatch.setenv('no_proxy', '192.168.0.0/24,127.0.0.1,localhost.localdomain,172.16.1.1, google.com:6000')
+    monkeypatch.setenv('NO_PROXY', '192.168.0.0/24,127.0.0.1,localhost.localdomain,172.16.1.1, google.com:6000')
     assert should_bypass_proxies(url, no_proxy=None) == expected
 
 
 @pytest.mark.parametrize(
-    'cookiejar', (basics.cookielib.CookieJar(), RequestsCookieJar())
-)
+    'url, expected', (
+            ('http://172.16.1.1/', '172.16.1.1'),
+            ('http://172.16.1.1:5000/', '172.16.1.1'),
+            ('http://user:pass@172.16.1.1', '172.16.1.1'),
+            ('http://user:pass@172.16.1.1:5000', '172.16.1.1'),
+            ('http://hostname/', 'hostname'),
+            ('http://hostname:5000/', 'hostname'),
+            ('http://user:pass@hostname', 'hostname'),
+            ('http://user:pass@hostname:5000', 'hostname'),
+    ))
+def test_should_bypass_proxies_pass_only_hostname(url, expected, mocker):
+    """The proxy_bypass function should be called with a hostname or IP without
+    a port number or auth credentials.
+    """
+    proxy_bypass = mocker.patch('requests.utils.proxy_bypass')
+    should_bypass_proxies(url, no_proxy=None)
+    proxy_bypass.assert_called_once_with(expected)
+
+
+@pytest.mark.parametrize(
+    'cookiejar', (
+        compat.cookielib.CookieJar(),
+        RequestsCookieJar()
+    ))
 def test_add_dict_to_cookiejar(cookiejar):
     """Ensure add_dict_to_cookiejar works for
     non-RequestsCookieJar CookieJars
     """
-    cookiedict = {'test': 'cookies', 'good': 'cookies'}
+    cookiedict = {'test': 'cookies',
+                  'good': 'cookies'}
     cj = add_dict_to_cookiejar(cookiejar, cookiedict)
-    cookies = {cookie.name: cookie.value for cookie in cj}
+    cookies = dict((cookie.name, cookie.value) for cookie in cj)
     assert cookiedict == cookies
 
 
 @pytest.mark.parametrize(
-    'value, expected',
-    ((u'test', True), (u'æíöû', False), (u'ジェーピーニック', False)),
+    'value, expected', (
+                (u'test', True),
+                (u'æíöû', False),
+                (u'ジェーピーニック', False),
+    )
 )
 def test_unicode_is_ascii(value, expected):
     assert unicode_is_ascii(value) is expected
 
 
 @pytest.mark.parametrize(
-    'url, expected',
-    (
-        ('http://192.168.0.1:5000/', True),
-        ('http://192.168.0.1/', True),
-        ('http://172.16.1.1/', True),
-        ('http://172.16.1.1:5000/', True),
-        ('http://localhost.localdomain:5000/v1.0/', True),
-        ('http://172.16.1.12/', False),
-        ('http://172.16.1.12:5000/', False),
-        ('http://google.com:5000/v1.0/', False),
-    ),
-)
-def test_should_bypass_proxies_no_proxy(url, expected, monkeypatch):
+    'url, expected', (
+            ('http://192.168.0.1:5000/', True),
+            ('http://192.168.0.1/', True),
+            ('http://172.16.1.1/', True),
+            ('http://172.16.1.1:5000/', True),
+            ('http://localhost.localdomain:5000/v1.0/', True),
+            ('http://172.16.1.12/', False),
+            ('http://172.16.1.12:5000/', False),
+            ('http://google.com:5000/v1.0/', False),
+    ))
+def test_should_bypass_proxies_no_proxy(
+        url, expected, monkeypatch):
     """Tests for function should_bypass_proxies to check if proxy
     can be bypassed or not using the 'no_proxy' argument
     """
@@ -622,37 +698,36 @@ def test_should_bypass_proxies_no_proxy(url, expected, monkeypatch):
 
 @pytest.mark.skipif(os.name != 'nt', reason='Test only on Windows')
 @pytest.mark.parametrize(
-    'url, expected, override',
-    (
-        ('http://192.168.0.1:5000/', True, None),
-        ('http://192.168.0.1/', True, None),
-        ('http://172.16.1.1/', True, None),
-        ('http://172.16.1.1:5000/', True, None),
-        ('http://localhost.localdomain:5000/v1.0/', True, None),
-        ('http://172.16.1.22/', False, None),
-        ('http://172.16.1.22:5000/', False, None),
-        ('http://google.com:5000/v1.0/', False, None),
-        ('http://mylocalhostname:5000/v1.0/', True, '<local>'),
-        ('http://192.168.0.1/', False, ''),
-    ),
-)
-def test_should_bypass_proxies_win_registry(
-    url, expected, override, monkeypatch
-):
+    'url, expected, override', (
+            ('http://192.168.0.1:5000/', True, None),
+            ('http://192.168.0.1/', True, None),
+            ('http://172.16.1.1/', True, None),
+            ('http://172.16.1.1:5000/', True, None),
+            ('http://localhost.localdomain:5000/v1.0/', True, None),
+            ('http://172.16.1.22/', False, None),
+            ('http://172.16.1.22:5000/', False, None),
+            ('http://google.com:5000/v1.0/', False, None),
+            ('http://mylocalhostname:5000/v1.0/', True, '<local>'),
+            ('http://192.168.0.1/', False, ''),
+    ))
+def test_should_bypass_proxies_win_registry(url, expected, override,
+                                            monkeypatch):
     """Tests for function should_bypass_proxies to check if proxy
     can be bypassed or not with Windows registry settings
     """
     if override is None:
         override = '192.168.*;127.0.0.1;localhost.localdomain;172.16.1.1'
-
-    import winreg
+    if compat.is_py3:
+        import winreg
+    else:
+        import _winreg as winreg
 
     class RegHandle:
-
         def Close(self):
             pass
 
     ie_settings = RegHandle()
+    proxyEnableValues = deque([1, "1"])
 
     def OpenKey(key, subkey):
         return ie_settings
@@ -660,8 +735,9 @@ def test_should_bypass_proxies_win_registry(
     def QueryValueEx(key, value_name):
         if key is ie_settings:
             if value_name == 'ProxyEnable':
-                return [1]
-
+                # this could be a string (REG_SZ) or a 32-bit number (REG_DWORD)
+                proxyEnableValues.rotate()
+                return [proxyEnableValues[0]]
             elif value_name == 'ProxyOverride':
                 return [override]
 
@@ -672,22 +748,22 @@ def test_should_bypass_proxies_win_registry(
     monkeypatch.setenv('NO_PROXY', '')
     monkeypatch.setattr(winreg, 'OpenKey', OpenKey)
     monkeypatch.setattr(winreg, 'QueryValueEx', QueryValueEx)
+    assert should_bypass_proxies(url, None) == expected
 
 
 @pytest.mark.parametrize(
-    'env_name, value',
-    (
-        ('no_proxy', '192.168.0.0/24,127.0.0.1,localhost.localdomain'),
-        ('no_proxy', None),
-        ('a_new_key', '192.168.0.0/24,127.0.0.1,localhost.localdomain'),
-        ('a_new_key', None),
-    ),
-)
+    'env_name, value', (
+            ('no_proxy', '192.168.0.0/24,127.0.0.1,localhost.localdomain'),
+            ('no_proxy', None),
+            ('a_new_key', '192.168.0.0/24,127.0.0.1,localhost.localdomain'),
+            ('a_new_key', None),
+    ))
 def test_set_environ(env_name, value):
     """Tests set_environ will set environ values and will restore the environ."""
     environ_copy = copy.deepcopy(os.environ)
     with set_environ(env_name, value):
         assert os.environ.get(env_name) == value
+
     assert os.environ == environ_copy
 
 

tests/testserver/server.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 import threading
 import socket
 import select
@@ -7,6 +8,7 @@ import select
 def consume_socket_content(sock, timeout=0.5):
     chunks = 65536
     content = b''
+
     while True:
         more_to_read = select.select([sock], [], [], timeout)[0]
         if not more_to_read:
@@ -17,6 +19,7 @@ def consume_socket_content(sock, timeout=0.5):
             break
 
         content += new_content
+
     return content
 
 
@@ -24,40 +27,37 @@ class Server(threading.Thread):
     """Dummy server using for unit testing"""
     WAIT_EVENT_TIMEOUT = 5
 
-    def __init__(
-        self,
-        handler=None,
-        host='localhost',
-        port=0,
-        requests_to_handle=1,
-        wait_to_close_event=None,
-    ):
+    def __init__(self, handler=None, host='localhost', port=0, requests_to_handle=1, wait_to_close_event=None):
         super(Server, self).__init__()
+
         self.handler = handler or consume_socket_content
         self.handler_results = []
+
         self.host = host
         self.port = port
         self.requests_to_handle = requests_to_handle
+
         self.wait_to_close_event = wait_to_close_event
         self.ready_event = threading.Event()
         self.stop_event = threading.Event()
 
     @classmethod
     def text_response_server(cls, text, request_timeout=0.5, **kwargs):
-
         def text_response_handler(sock):
-            request_content = consume_socket_content(
-                sock, timeout=request_timeout
-            )
+            request_content = consume_socket_content(sock, timeout=request_timeout)
             sock.send(text.encode('utf-8'))
+
             return request_content
 
+
         return Server(text_response_handler, **kwargs)
 
     @classmethod
     def basic_response_server(cls, **kwargs):
         return cls.text_response_server(
-            "HTTP/1.1 200 OK\r\n" + "Content-Length: 0\r\n\r\n", **kwargs
+            "HTTP/1.1 200 OK\r\n" +
+            "Content-Length: 0\r\n\r\n",
+            **kwargs
         )
 
     def run(self):
@@ -67,10 +67,11 @@ class Server(threading.Thread):
             self.port = self.server_sock.getsockname()[1]
             self.ready_event.set()
             self._handle_requests()
+
             if self.wait_to_close_event:
                 self.wait_to_close_event.wait(self.WAIT_EVENT_TIMEOUT)
         finally:
-            self.ready_event.set()  # just in case of exception
+            self.ready_event.set() # just in case of exception
             self._close_server_sock_ignore_errors()
             self.stop_event.set()
 
@@ -93,18 +94,16 @@ class Server(threading.Thread):
                 break
 
             handler_result = self.handler(sock)
+
             self.handler_results.append(handler_result)
 
     def _accept_connection(self):
         try:
-            ready, _, _ = select.select(
-                [self.server_sock], [], [], self.WAIT_EVENT_TIMEOUT
-            )
+            ready, _, _ = select.select([self.server_sock], [], [], self.WAIT_EVENT_TIMEOUT)
             if not ready:
                 return None
 
             return self.server_sock.accept()[0]
-
         except (select.error, socket.error):
             return None
 
@@ -121,7 +120,8 @@ class Server(threading.Thread):
                 # avoid server from waiting for event timeouts
                 # if an exception is found in the main thread
                 self.wait_to_close_event.set()
+
         # ensure server thread doesn't get stuck waiting for connections
         self._close_server_sock_ignore_errors()
         self.join()
-        return False  # allow exceptions to propagate
+        return False # allow exceptions to propagate

tests/utils.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 import contextlib
 import os
 
@@ -13,7 +14,6 @@ def override_environ(**kwargs):
             os.environ[key] = value
     try:
         yield
-
     finally:
         os.environ.clear()
         os.environ.update(save_env)

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py36
+envlist = py26,py27,py34,py35,py36
 
 [testenv]