v2.17.2

.gitignore

@@ -5,7 +5,6 @@ nosetests.xml
 junit-report.xml
 pylint.txt
 toy.py
-.cache/
 cover/
 build/
 docs/_build

AUTHORS.rst

@@ -182,6 +182,3 @@ Patches and Suggestions
 - David Fontenot (`@davidfontenot <https://github.com/davidfontenot>`_)
 - Shmuel Amar (`@shmuelamar <https://github.com/shmuelamar>`_)
 - Gary Wu (`@garywu <https://github.com/garywu>`_)
-- Ryan Pineo (`@ryanpineo <https://github.com/ryanpineo>`_)
-- Ed Morley (`@edmorley <https://github.com/edmorley>`_)
-- Matt Liu <liumatt@gmail.com> (`@mlcrazy <https://github.com/mlcrazy>`_)

HISTORY.rst

@@ -3,49 +3,6 @@
 Release History
 ---------------
 
-2.18.2 (2017-07-25)
-+++++++++++++++++++
-
-**Bugfixes**
-
-- ``requests.help`` no longer fails on Python 2.6 due to the absence of
-  ``ssl.OPENSSL_VERSION_NUMBER``.
-
-**Dependencies**
-
-- We now support urllib3 v1.22.
-
-2.18.1 (2017-06-14)
-+++++++++++++++++++
-
-**Bugfixes**
-
-- Fix an error in the packaging whereby the *.whl contained incorrect data that
-  regressed the fix in v2.17.3.
-
-2.18.0 (2017-06-14)
-+++++++++++++++++++
-
-**Improvements**
-
-- ``Response`` is now a context manager, so can be used directly in a ``with`` statement
-  without first having to be wrapped by ``contextlib.closing()``.
-
-**Bugfixes**
-
-- Resolve installation failure if multiprocessing is not available
-- Resolve tests crash if multiprocessing is not able to determine the number of CPU cores
-- Resolve error swallowing in utils set_environ generator
-
-
-2.17.3 (2017-05-29)
-+++++++++++++++++++
-
-**Improvements**
-
-- Improved ``packages`` namespace identity support, for monkeypatching libraries.
-
-
 2.17.2 (2017-05-29)
 +++++++++++++++++++
 
@@ -1502,3 +1459,4 @@ This is not a backwards compatible change.
 
 * Frustration
 * Conception
+

MANIFEST.in

@@ -1,2 +1,2 @@
-include README.rst LICENSE NOTICE HISTORY.rst pytest.ini requirements.txt
+include README.rst LICENSE NOTICE HISTORY.rst pytest.ini
 recursive-include tests *.py

Makefile

@@ -8,10 +8,10 @@ ci:
 	py.test -n 8 --boxed --junitxml=report.xml
 
 test-readme:
-	@python setup.py check --restructuredtext --strict && ([ $$? -eq 0 ] && echo "README.rst and HISTORY.rst ok") || echo "Invalid markup in README.rst or HISTORY.rst!"
+	python setup.py check -r -s
 
 flake8:
-	flake8 --ignore=E501,F401,E128,E402,E731,F821 requests
+	flake8 --ignore=E501 requests
 
 coverage:
 	py.test --cov-config .coveragerc --verbose --cov-report term --cov-report xml --cov=requests tests

README.rst

@@ -93,7 +93,7 @@ To install Requests, simply:
     $ pip install requests
     ✨🍰✨
 
-Satisfaction guaranteed.
+Satisfaction, guaranteed.
 
 Documentation
 -------------

docs/_static/custom.css

@@ -1,39 +0,0 @@
-#carbonads {
-  display: block;
-  overflow: hidden;
-  padding: 1em;
-  background-color: #eeeeee;
-  text-align: center;
-  border: solid 1px #cccccc;
-  margin: 1.5em 0 2em;
-  border-radius: 2px;
-  line-height: 1.5;
-}
-
-#carbonads a {
-  border-bottom: 0;
-}
-
-#carbonads span {
-  display: block;
-  overflow: hidden;
-}
-
-.carbon-img {
-  display: block;
-  margin: 0 auto 1em;
-  text-align: center;
-}
-
-.carbon-text {
-  display: block;
-  margin-bottom: 1em;
-}
-
-.carbon-poweredby {
-  display: block;
-  text-transform: uppercase;
-  letter-spacing: 1px;
-  line-height: 1;
-  font-size: 10px;
-}

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="http://ghbtns.com/github-btn.html?user=kennethreitz&repo=requests&type=watch&count=true&size=large"
     allowtransparency="true" frameborder="0" scrolling="0" width="200px" height="35px"></iframe>
 </p>
 
@@ -14,7 +14,16 @@
   human beings.
 </p>
 
-<script async type="text/javascript" src="//cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=pythonrequestsorg" id="_carbonads_js"></script>
+
+<h3>The Hitchhiker's Guide to Python</h3>
+
+<p>This guide is now available in tangible book form!</p>
+
+<a href="https://www.amazon.com/Hitchhikers-Guide-Python-Practices-Development/dp/1491933178/ref=as_li_ss_il?ie=UTF8&linkCode=li2&tag=bookforkind-20&linkId=804806ebdacaf3b56567347f3afbdbca" target="_blank"><img border="0" src="https://ws-na.amazon-adsystem.com/widgets/q?_encoding=UTF8&ASIN=1491933178&Format=_SL160_&ID=AsinImage&MarketPlace=US&ServiceVersion=20070822&WS=1&tag=bookforkind-20" ></a><img src="//ir-na.amazon-adsystem.com/e/ir?t=bookforkind-20&l=li2&o=1&a=1491933178" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
+
+<p>All proceeds are being directly donated to the <a href="https://djangogirls.org">DjangoGirls</a> organization.</p>
+
+
 
 <h3>Stay Informed</h3>
 <p>Receive updates on new releases and upcoming projects.</p>

docs/_templates/sidebarlogo.html

@@ -4,7 +4,7 @@
   </a>
 </p>
 <p>
-<iframe src="http://ghbtns.com/github-btn.html?user=requests&repo=requests&type=watch&count=true&size=large"
+<iframe src="http://ghbtns.com/github-btn.html?user=kennethreitz&repo=requests&type=watch&count=true&size=large"
   allowtransparency="true" frameborder="0" scrolling="0" width="200px" height="35px"></iframe>
 </p>
 
@@ -21,7 +21,14 @@
 
 <hr/>
 
-<script async type="text/javascript" src="//cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=pythonrequestsorg" id="_carbonads_js"></script>
+<h3>The Hitchhiker's Guide to Python</h3>
+
+<p>This guide is now available in tangible book form!</p>
+
+<a href="https://www.amazon.com/Hitchhikers-Guide-Python-Practices-Development/dp/1491933178/ref=as_li_ss_il?ie=UTF8&linkCode=li2&tag=bookforkind-20&linkId=804806ebdacaf3b56567347f3afbdbca" target="_blank"><img border="0" src="https://ws-na.amazon-adsystem.com/widgets/q?_encoding=UTF8&ASIN=1491933178&Format=_SL160_&ID=AsinImage&MarketPlace=US&ServiceVersion=20070822&WS=1&tag=bookforkind-20" ></a><img src="//ir-na.amazon-adsystem.com/e/ir?t=bookforkind-20&l=li2&o=1&a=1491933178" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
+
+<p>All proceeds are being directly donated to the <a href="https://djangogirls.org">DjangoGirls</a> organization.</p>
+
 
 <p>If you enjoy using this project, <a href="https://saythanks.io/to/kennethreitz">Say Thanks!</a></p>
 

docs/conf.py

@@ -126,7 +126,7 @@ html_theme = 'alabaster'
 # documentation.
 html_theme_options = {
     'show_powered_by': False,
-    'github_user': 'requests',
+    'github_user': 'kennethreitz',
     'github_repo': 'requests',
     'github_banner': True,
     'show_related': False

docs/dev/philosophy.rst

@@ -7,9 +7,9 @@ Requests is an open but opinionated library, created by an open but opinionated
 Management Style
 ~~~~~~~~~~~~~~~~
 
-`Kenneth Reitz <http://kennethreitz.org>`_ is the BDFL. He has final say in any decision related to the Requests project. Kenneth is responsible for the direction and form of the library, as well as its presentation. In addition to making decisions based on technical merit, he is responsible for making decisions based on the development philosophy of Requests.
+`Kenneth Reitz <http://kennethreitz.org>`_ is the BDFL. He has final say in any decision related to the Requests project. Kenneth is responsible for the direction and form of the library. In addition to making decisions based on technical merit, he is responsible for making decisions based on the development philosophy of Requests. Only Kenneth may merge code into Requests.
 
-`Ian Cordasco <http://www.coglib.com/~icordasc/>`_ and `Cory Benfield <https://lukasa.co.uk/about/>`_ are the core contributors. They are responsible for triaging bug reports, reviewing pull requests and ensuring that Kenneth is kept up to speed with developments around the library. The day-to-day managing of the project is done by the core contributors. They are responsible for making judgements about whether or not a feature request is likely to be accepted by Kenneth. Their word is, in some ways, more final than Kenneth's.
+`Ian Cordasco <http://www.coglib.com/~icordasc/>`_ and `Cory Benfield <https://lukasa.co.uk/about/>`_ are the core contributors. They are responsible for triaging bug reports, reviewing pull requests and ensuring that Kenneth is kept up to speed with developments around the library. The day-to-day managing of the project is done by the core contributors. They are responsible for making judgements about whether or not a feature request is likely to be accepted by Kenneth. They do not have the authority to change code or merge code changes, though they may change documentation. Their word is not final.
 
 Values
 ~~~~~~

docs/dev/todo.rst

@@ -23,11 +23,10 @@ Development Dependencies
 
 You'll need to install py.test in order to run the Requests' test suite::
 
-    $ venv .venv
-    $ source .venv/bin/activate
-
-    $ make
-    $ python setup.py test
+    $ pip install pipenv
+    $ pipenv lock
+    $ pipenv install --dev
+    $ pipenv run py.test tests
     ============================= test session starts ==============================
     platform darwin -- Python 3.4.4, pytest-3.0.6, py-1.4.32, pluggy-0.4.0
     ...
@@ -42,8 +41,6 @@ You'll need to install py.test in order to run the Requests' test suite::
 
     ============== 442 passed, 1 skipped, 2 xpassed in 46.48 seconds ===============
 
-You can also run ``$ make tests`` to run against all supported Python versions, using tox/detox.
-
 Runtime Environments
 --------------------
 
@@ -62,3 +59,13 @@ with the `Requests-Toolbelt`_.
 
 .. _Requests-Toolbelt: http://toolbelt.readthedocs.io/
 
+
+Are you crazy?
+--------------
+
+- SPDY support would be awesome. No C extensions.
+
+Downstream Repackaging
+----------------------
+
+If you are repackaging Requests, please note that you must also redistribute the ``cacerts.pem`` file in order to get correct SSL functionality.

docs/user/advanced.rst

@@ -301,11 +301,15 @@ release the connection back to the pool unless you consume all the data or call
 :meth:`Response.close <requests.Response.close>`. This can lead to
 inefficiency with connections. If you find yourself partially reading request
 bodies (or not reading them at all) while using ``stream=True``, you should
-make the request within a ``with`` statement to ensure it's always closed::
+consider using ``contextlib.closing`` (`documented here`_), like this::
 
-    with requests.get('http://httpbin.org/get', stream=True) as r:
+    from contextlib import closing
+
+    with closing(requests.get('http://httpbin.org/get', stream=True)) as r:
         # Do things with the response here.
 
+.. _`documented here`: http://docs.python.org/2/library/contextlib.html#contextlib.closing
+
 .. _keep-alive:
 
 Keep-Alive

docs/user/install.rst

@@ -1,14 +1,14 @@
 .. _install:
 
-Installation of Requests
-========================
+Installation
+============
 
 This part of the documentation covers the installation of Requests.
 The first step to using any software package is getting it properly installed.
 
 
-$ pip install requests
-----------------------
+Pip Install Requests
+--------------------
 
 To install Requests, simply run this simple command in your terminal of choice::
 
@@ -31,10 +31,9 @@ You can either clone the public repository::
 Or, download the `tarball <https://github.com/requests/requests/tarball/master>`_::
 
     $ curl -OL https://github.com/requests/requests/tarball/master
-    # optionally, zipball is also available (for Windows users).
+      # optionally, zipball is also available (for Windows users).
 
 Once you have a copy of the source, you can embed it in your own Python
 package, or install it into your site-packages easily::
 
-    $ cd requests
-    $ pip install .
+    $ python setup.py install

requests/__init__.py

@@ -40,44 +40,38 @@ is at <http://python-requests.org>.
 :license: Apache 2.0, see LICENSE for more details.
 """
 
+from .__version__ import __title__, __description__, __url__, __version__
+from .__version__ import __build__, __author__, __author_email__, __license__
+from .__version__ import __copyright__, __cake__
+
+# Check urllib3 for compatibility.
 import urllib3
-import chardet
-import warnings
-from .exceptions import RequestsDependencyWarning
-
-
-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')
-
-    # Check urllib3 for compatibility.
-    major, minor, patch = urllib3_version  # noqa: F811
-    major, minor, patch = int(major), int(minor), int(patch)
-    # urllib3 >= 1.21.1, < 1.22
+urllib3_version = urllib3.__version__.split('.')
+# Sometimes, urllib3 only reports its version as 16.1.
+if len(urllib3_version) == 2:
+    urllib3_version.append('0')
+major, minor, patch = urllib3_version
+major, minor, patch = int(major), int(minor), int(patch)
+# urllib3 >= 1.21.1, < 1.22
+try:
     assert major == 1
     assert minor >= 21
     assert minor <= 22
+except AssertionError:
+    raise RuntimeError('Requests dependency \'urllib3\' must be version >= 1.21.1, < 1.22!')
 
-    # Check chardet for compatibility.
-    major, minor, patch = chardet_version.split('.')[:3]
-    major, minor, patch = int(major), int(minor), int(patch)
-    # chardet >= 3.0.2, < 3.1.0
+
+# Check chardet for compatibility.
+import chardet
+major, minor, patch = chardet.__version__.split('.')[:3]
+major, minor, patch = int(major), int(minor), int(patch)
+# chardet >= 3.0.2, < 3.1.0
+try:
     assert major == 3
     assert minor < 1
     assert patch >= 2
-
-
-# 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)
+except AssertionError:
+    raise RuntimeError('Requests dependency \'chardet\' must be version >= 3.0.2, < 3.1.0!')
 
 # Attempt to enable urllib3's SNI support, if possible
 try:
@@ -86,14 +80,12 @@ try:
 except ImportError:
     pass
 
+import warnings
+
 # 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 packages
 from .models import Request, Response, PreparedRequest

requests/__version__.py

@@ -5,10 +5,12 @@
 __title__ = 'requests'
 __description__ = 'Python HTTP for Humans.'
 __url__ = 'http://python-requests.org'
-__version__ = '2.18.2'
-__build__ = 0x021802
+__version__ = '2.17.2'
+__build__ = 0x021702
 __author__ = 'Kenneth Reitz'
 __author_email__ = 'me@kennethreitz.org'
 __license__ = 'Apache 2.0'
 __copyright__ = 'Copyright 2017 Kenneth Reitz'
 __cake__ = u'\u2728 \U0001f370 \u2728'
+
+

requests/api.py

@@ -73,7 +73,7 @@ def get(url, params=None, **kwargs):
 
 
 def options(url, **kwargs):
-    r"""Sends an OPTIONS request.
+    r"""Sends a OPTIONS request.
 
     :param url: URL for the new :class:`Request` object.
     :param \*\*kwargs: Optional arguments that ``request`` takes.
@@ -137,7 +137,7 @@ def patch(url, data=None, **kwargs):
     :rtype: requests.Response
     """
 
-    return request('patch', url, data=data, **kwargs)
+    return request('patch', url,  data=data, **kwargs)
 
 
 def delete(url, **kwargs):

requests/auth.py

@@ -192,7 +192,7 @@ class HTTPDigestAuth(AuthBase):
         elif qop == 'auth' or 'auth' in qop.split(','):
             noncebit = "%s:%s:%s:%s:%s" % (
                 nonce, ncvalue, cnonce, 'auth', HA2
-            )
+                )
             respdig = KD(HA1, noncebit)
         else:
             # XXX handle auth-int.

requests/cookies.py

@@ -306,10 +306,8 @@ class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
         """
         dictionary = {}
         for cookie in iter(self):
-            if (
-                (domain is None or cookie.domain == domain) and
-                (path is None or cookie.path == path)
-            ):
+            if (domain is None or cookie.domain == domain) and (path is None
+                                                or cookie.path == path):
                 dictionary[cookie.name] = cookie.value
         return dictionary
 

requests/exceptions.py

@@ -100,7 +100,6 @@ class StreamConsumedError(RequestException, TypeError):
 class RetryError(RequestException):
     """Custom retries logic failed"""
 
-
 class UnrewindableBodyError(RequestException):
     """Requests encountered an error when trying to rewind a body"""
 
@@ -115,8 +114,3 @@ class RequestsWarning(Warning):
 class FileModeWarning(RequestsWarning, DeprecationWarning):
     """A file was opened in text mode, but Requests determined its binary length."""
     pass
-
-
-class RequestsDependencyWarning(RequestsWarning):
-    """An imported dependency doesn't match the expected version range."""
-    pass

requests/help.py

@@ -23,7 +23,7 @@ else:
 
 
 def _implementation():
-    """Return a dict with the Python implementation and version.
+    """Return a dict with the Python implementation and verison.
 
     Provide both the name and the version of the Python implementation
     currently running. For example, on CPython 2.7.5 it will return
@@ -44,7 +44,7 @@ def _implementation():
         if sys.pypy_version_info.releaselevel != 'final':
             implementation_version = ''.join([
                 implementation_version, sys.pypy_version_info.releaselevel
-            ])
+                ])
     elif implementation == 'Jython':
         implementation_version = platform.python_version()  # Complete Guess
     elif implementation == 'IronPython':
@@ -85,16 +85,12 @@ def info():
         'version': getattr(cryptography, '__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,
-        'system_ssl': system_ssl_info,
+        'system_ssl': {
+            'version': '%x' % ssl.OPENSSL_VERSION_NUMBER,
+        },
         'using_pyopenssl': pyopenssl is not None,
         'pyOpenSSL': pyopenssl_info,
         'urllib3': urllib3_info,
@@ -105,11 +101,10 @@ def info():
         },
     }
 
-
 def main():
     """Pretty-print the bug information as JSON."""
     print(json.dumps(info(), sort_keys=True, indent=2))
 
-
 if __name__ == '__main__':
     main()
+

requests/models.py

@@ -215,9 +215,8 @@ class Request(RequestHooksMixin):
       <PreparedRequest [GET]>
     """
 
-    def __init__(self,
-            method=None, url=None, headers=None, files=None, data=None,
-            params=None, auth=None, cookies=None, hooks=None, json=None):
+    def __init__(self, method=None, url=None, headers=None, files=None,
+        data=None, params=None, auth=None, cookies=None, hooks=None, json=None):
 
         # Default empty dicts for dict params.
         data = [] if data is None else data
@@ -296,9 +295,8 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
         #: integer denoting starting position of a readable file-like body.
         self._body_position = None
 
-    def prepare(self,
-            method=None, url=None, headers=None, files=None, data=None,
-            params=None, auth=None, cookies=None, hooks=None, json=None):
+    def prepare(self, method=None, url=None, headers=None, files=None,
+        data=None, params=None, auth=None, cookies=None, hooks=None, json=None):
         """Prepares the entire request with the given parameters."""
 
         self.prepare_method(method)
@@ -634,12 +632,6 @@ class Response(object):
         #: is a response.
         self.request = None
 
-    def __enter__(self):
-        return self
-
-    def __exit__(self, *args):
-        self.close()
-
     def __getstate__(self):
         # Consume everything; accessing the content attribute makes
         # sure the content has been fully read.

requests/packages.py

@@ -4,7 +4,7 @@ import sys
 # I don't like it either. Just look the other way. :)
 
 for package in ('urllib3', 'idna', 'chardet'):
-    locals()[package] = __import__(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):

requests/sessions.py

@@ -114,7 +114,7 @@ class SessionRedirectMixin(object):
                           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
+        hist = [] # keep track of history
 
         url = self.get_redirect_target(resp)
         while url:
@@ -433,9 +433,20 @@ 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):
+        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.
 
@@ -474,16 +485,16 @@ class Session(SessionRedirectMixin):
         """
         # Create the Request.
         req = Request(
-            method=method.upper(),
-            url=url,
-            headers=headers,
-            files=files,
-            data=data or {},
-            json=json,
-            params=params or {},
-            auth=auth,
-            cookies=cookies,
-            hooks=hooks,
+            method = method.upper(),
+            url = url,
+            headers = headers,
+            files = files,
+            data = data or {},
+            json = json,
+            params = params or {},
+            auth = auth,
+            cookies = cookies,
+            hooks = hooks,
         )
         prep = self.prepare_request(req)
 
@@ -568,7 +579,7 @@ class Session(SessionRedirectMixin):
         :rtype: requests.Response
         """
 
-        return self.request('PATCH', url, data=data, **kwargs)
+        return self.request('PATCH', url,  data=data, **kwargs)
 
     def delete(self, url, **kwargs):
         r"""Sends a DELETE request. Returns :class:`Response` object.
@@ -704,7 +715,7 @@ class Session(SessionRedirectMixin):
     def mount(self, prefix, adapter):
         """Registers a connection adapter to a prefix.
 
-        Adapters are sorted in descending order by prefix length.
+        Adapters are sorted in descending order by key length.
         """
         self.adapters[prefix] = adapter
         keys_to_move = [k for k in self.adapters if len(k) < len(prefix)]

requests/utils.py

@@ -494,7 +494,8 @@ def get_unicode_from_response(r):
 
 # The unreserved URI characters (RFC 3986)
 UNRESERVED_SET = frozenset(
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" + "0123456789-._~")
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
+    + "0123456789-._~")
 
 
 def unquote_unreserved(uri):
@@ -612,18 +613,18 @@ def set_environ(env_name, value):
     the environment variable 'env_name'.
 
     If 'value' is None, do nothing"""
-    value_changed = value is not None
-    if value_changed:
+    if value is not None:
         old_value = os.environ.get(env_name)
         os.environ[env_name] = value
     try:
         yield
     finally:
-        if value_changed:
-            if old_value is None:
-                del os.environ[env_name]
-            else:
-                os.environ[env_name] = old_value
+        if value is None:
+            return
+        if old_value is None:
+            del os.environ[env_name]
+        else:
+            os.environ[env_name] = old_value
 
 
 def should_bypass_proxies(url, no_proxy):
@@ -850,7 +851,6 @@ def get_auth_from_url(url):
 _CLEAN_HEADER_REGEX_BYTE = re.compile(b'^\\S[^\\r\\n]*$|^$')
 _CLEAN_HEADER_REGEX_STR = re.compile(r'^\S[^\r\n]*$|^$')
 
-
 def check_header_validity(header):
     """Verifies that header value is a string which doesn't contain
     leading whitespace or return characters. This prevents unintended
@@ -888,7 +888,6 @@ def urldefragauth(url):
 
     return urlunparse((scheme, netloc, path, params, query, ''))
 
-
 def rewind_body(prepared_request):
     """Move file pointer back to its recorded starting position
     so it can be read again on redirect.

setup.py

@@ -8,6 +8,7 @@ from codecs import open
 
 from setuptools import setup
 from setuptools.command.test import test as TestCommand
+from multiprocessing import cpu_count
 
 here = os.path.abspath(os.path.dirname(__file__))
 
@@ -16,11 +17,7 @@ class PyTest(TestCommand):
 
     def initialize_options(self):
         TestCommand.initialize_options(self)
-        try:
-            from multiprocessing import cpu_count
-            self.pytest_args = ['-n', str(cpu_count()), '--boxed']
-        except (ImportError, NotImplementedError):
-            self.pytest_args = ['-n', '1', '--boxed']
+        self.pytest_args = ['-n', str(cpu_count()), '--boxed']
 
     def finalize_options(self):
         TestCommand.finalize_options(self)
@@ -44,7 +41,7 @@ packages = ['requests']
 requires = [
     'chardet>=3.0.2,<3.1.0',
     'idna>=2.5,<2.6',
-    'urllib3>=1.21.1,<1.23',
+    'urllib3>=1.21.1,<1.22',
     'certifi>=2017.4.17'
 
 ]

tests/test_help.py

@@ -1,21 +0,0 @@
-# -*- encoding: utf-8
-
-import sys
-
-import pytest
-
-from requests.help import info
-
-
-@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.
-    """
-    assert info()['system_ssl'] == {'version': ''}
-
-
-@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'] != ''

tests/test_packages.py

@@ -1,13 +0,0 @@
-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_requests.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 """Tests for Requests."""
@@ -1667,12 +1668,6 @@ class TestRequests:
         next(it)
         assert len(list(it)) == 3
 
-    def test_response_context_manager(self, httpbin):
-        with requests.get(httpbin('stream/4'), stream=True) as response:
-            assert isinstance(response, requests.Response)
-
-        assert response.raw.closed
-
     def test_unconsumed_session_response_closes_connection(self, httpbin):
         s = requests.session()
 
@@ -2369,7 +2364,7 @@ class TestPreparingURLs(object):
     )
     def test_parameters_for_nonstandard_schemes(self, input, params, expected):
         """
-        Setting parameters for nonstandard schemes is allowed if those schemes
+        Setting paramters for nonstandard schemes is allowed if those schemes
         begin with "http", and is forbidden otherwise.
         """
         r = requests.Request('GET', url=input, params=params)

tests/test_utils.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 import os
-import copy
 from io import BytesIO
 
 import pytest
@@ -18,7 +17,7 @@ from requests.utils import (
     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)
+    urldefragauth, add_dict_to_cookiejar)
 from requests._internal_utils import unicode_is_ascii
 
 from .compat import StringIO, cStringIO
@@ -652,29 +651,4 @@ def test_should_bypass_proxies_win_registry(url, expected, override,
     monkeypatch.setenv('NO_PROXY', '')
     monkeypatch.setattr(winreg, 'OpenKey', OpenKey)
     monkeypatch.setattr(winreg, 'QueryValueEx', QueryValueEx)
-
-
-@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),
-    ))
-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
-
-
-def test_set_environ_raises_exception():
-    """Tests set_environ will raise exceptions in context when the
-    value parameter is None."""
-    with pytest.raises(Exception) as exception:
-        with set_environ('test1', None):
-            raise Exception('Expected exception')
-
-    assert 'Expected exception' in str(exception.value)
+    assert should_bypass_proxies(url, no_proxy=None) == expected