From f6e07bb27f9fe092dabb1945ef7fd515db7870fe Mon Sep 17 00:00:00 2001
From: Nate Prewitt <Nate.Prewitt@gmail.com>
Date: Mon, 3 Jul 2017 17:21:56 -0600
Subject: [PATCH 01/12] fix OPENSSL_VERSION_NUMBER check on Python2.6's ssl
 module

---
 requests/help.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/requests/help.py b/requests/help.py
index 695b5ee2..cd961c78 100644
--- a/requests/help.py
+++ b/requests/help.py
@@ -85,12 +85,16 @@ 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': {
-            'version': '%x' % ssl.OPENSSL_VERSION_NUMBER,
-        },
+        'system_ssl': system_ssl_info,
         'using_pyopenssl': pyopenssl is not None,
         'pyOpenSSL': pyopenssl_info,
         'urllib3': urllib3_info,

From 51feabbc27821c5acb7f0ceb932d19c0d79f16d1 Mon Sep 17 00:00:00 2001
From: Nate Prewitt <Nate.Prewitt@gmail.com>
Date: Mon, 3 Jul 2017 17:41:53 -0600
Subject: [PATCH 02/12] test ssl version check functions as expected in python
 2.6

---
 tests/test_help.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 tests/test_help.py

diff --git a/tests/test_help.py b/tests/test_help.py
new file mode 100644
index 00000000..f08fdd97
--- /dev/null
+++ b/tests/test_help.py
@@ -0,0 +1,21 @@
+# -*- 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'] != ''

From 14176d1d63b6a85308fd61a9a20c8aeed398043b Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.org>
Date: Thu, 6 Jul 2017 17:57:28 -0400
Subject: [PATCH 03/12] no more stickers

---
 docs/_templates/sidebarintro.html | 5 -----
 docs/_templates/sidebarlogo.html  | 6 ------
 2 files changed, 11 deletions(-)

diff --git a/docs/_templates/sidebarintro.html b/docs/_templates/sidebarintro.html
index 02d07f47..f840e9ef 100644
--- a/docs/_templates/sidebarintro.html
+++ b/docs/_templates/sidebarintro.html
@@ -16,11 +16,6 @@
 
 <script async type="text/javascript" src="//cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=pythonrequestsorg" id="_carbonads_js"></script>
 
-<h3>Stickers!</h3>
-
-<script src="https://gumroad.com/js/gumroad.js"></script>
-<a class="gumroad-button" href="https://gum.co/requests-stickers" target="_blank">Order Stickers!</a>
-
 <h3>Stay Informed</h3>
 <p>Receive updates on new releases and upcoming projects.</p>
 
diff --git a/docs/_templates/sidebarlogo.html b/docs/_templates/sidebarlogo.html
index 09ad797b..fba676f1 100644
--- a/docs/_templates/sidebarlogo.html
+++ b/docs/_templates/sidebarlogo.html
@@ -23,12 +23,6 @@
 
 <script async type="text/javascript" src="//cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=pythonrequestsorg" id="_carbonads_js"></script>
 
-<h3>Stickers!</h3>
-
-<script src="https://gumroad.com/js/gumroad.js"></script>
-<a class="gumroad-button" href="https://gum.co/requests-stickers" target="_blank">Order Stickers!</a>
-
-
 <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"

From c6a80640d16871cf88d2d71ddd04aaf23e854f3f Mon Sep 17 00:00:00 2001
From: Kubilay Kocak <koobs@users.noreply.github.com>
Date: Sat, 15 Jul 2017 14:44:57 +1000
Subject: [PATCH 04/12] Add requirements.txt to MANIFEST.in

---
 MANIFEST.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 650744ca..2c0fb95c 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,2 @@
-include README.rst LICENSE NOTICE HISTORY.rst pytest.ini
+include README.rst LICENSE NOTICE HISTORY.rst pytest.ini requirements.txt
 recursive-include tests *.py

From d8c2fdf92f6f2124bb4ef73dd898f1c1824b7c9b Mon Sep 17 00:00:00 2001
From: Alex Muller <alex@mullr.net>
Date: Thu, 20 Jul 2017 10:06:19 +0200
Subject: [PATCH 05/12] Use 'prefix' instead of 'key' in session docstring

This commit makes the API docs more clear. The 'key' is an
implementation detail.
---
 requests/sessions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requests/sessions.py b/requests/sessions.py
index db913089..8c06448e 100644
--- a/requests/sessions.py
+++ b/requests/sessions.py
@@ -704,7 +704,7 @@ class Session(SessionRedirectMixin):
     def mount(self, prefix, adapter):
         """Registers a connection adapter to a prefix.
 
-        Adapters are sorted in descending order by key length.
+        Adapters are sorted in descending order by prefix length.
         """
         self.adapters[prefix] = adapter
         keys_to_move = [k for k in self.adapters if len(k) < len(prefix)]

From 8d1228cd1943bfe89ffaae32e15b2feb3f8479f5 Mon Sep 17 00:00:00 2001
From: Cory Benfield <lukasaoz@gmail.com>
Date: Thu, 20 Jul 2017 10:08:50 +0100
Subject: [PATCH 06/12] Allow urllib3 1.22

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 93a85077..98702858 100755
--- a/setup.py
+++ b/setup.py
@@ -44,7 +44,7 @@ packages = ['requests']
 requires = [
     'chardet>=3.0.2,<3.1.0',
     'idna>=2.5,<2.6',
-    'urllib3>=1.21.1,<1.22',
+    'urllib3>=1.21.1,<1.23',
     'certifi>=2017.4.17'
 
 ]

From c6e18b04e33cae3006b26b3fea0e1e3b4afb8ffa Mon Sep 17 00:00:00 2001
From: Andrey Portnoy <aportnoj@gmail.com>
Date: Thu, 20 Jul 2017 20:49:24 -0700
Subject: [PATCH 07/12] redundant comma

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 1dbee794..fe6cf5f6 100644
--- a/README.rst
+++ b/README.rst
@@ -93,7 +93,7 @@ To install Requests, simply:
     $ pip install requests
     ✨🍰✨
 
-Satisfaction, guaranteed.
+Satisfaction guaranteed.
 
 Documentation
 -------------

From 6cc891fd3204c63e57ccfae4b91bb6edca2d876e Mon Sep 17 00:00:00 2001
From: Cory Benfield <lukasaoz@gmail.com>
Date: Tue, 25 Jul 2017 16:21:48 +0100
Subject: [PATCH 08/12] v2.18.2

---
 HISTORY.rst             | 13 +++++++++----
 requests/__version__.py |  4 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index fcf44951..1082dc16 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,13 +3,18 @@
 Release History
 ---------------
 
-dev
-+++
-
-**Improvements**
+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)
 +++++++++++++++++++
 
diff --git a/requests/__version__.py b/requests/__version__.py
index 8c7ebbbc..156ff20a 100644
--- a/requests/__version__.py
+++ b/requests/__version__.py
@@ -5,8 +5,8 @@
 __title__ = 'requests'
 __description__ = 'Python HTTP for Humans.'
 __url__ = 'http://python-requests.org'
-__version__ = '2.18.1'
-__build__ = 0x021801
+__version__ = '2.18.2'
+__build__ = 0x021802
 __author__ = 'Kenneth Reitz'
 __author_email__ = 'me@kennethreitz.org'
 __license__ = 'Apache 2.0'

From 9e8d403a21fbe0e97fff8a096bf4746d033d0cc5 Mon Sep 17 00:00:00 2001
From: Cory Benfield <lukasaoz@gmail.com>
Date: Tue, 25 Jul 2017 16:23:50 +0100
Subject: [PATCH 09/12] Prepare changelog for next release

---
 HISTORY.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/HISTORY.rst b/HISTORY.rst
index 1082dc16..4c6bc740 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,13 @@
 Release History
 ---------------
 
+dev
++++
+
+**Improvements**
+
+**Bugfixes**
+
 2.18.2 (2017-07-25)
 +++++++++++++++++++
 

From b77c1a3debbca5f7317773a2a7a75540ad4c45cf Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 26 Jul 2017 10:23:01 +0100
Subject: [PATCH 10/12] Correct urllib3 compatibility comment

So that it's in line with the code. I saw the warning raised recently and had to dive into the code for exact compatibility, but I stopped after reading the comment rather than the code.
Maybe a better solution would be to surface the supported versions in the warning, but I see it was changed recently in https://github.com/requests/requests/pull/4144/
---
 requests/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requests/__init__.py b/requests/__init__.py
index 90a0d11a..268e7dcc 100644
--- a/requests/__init__.py
+++ b/requests/__init__.py
@@ -57,7 +57,7 @@ def check_compatibility(urllib3_version, chardet_version):
     # 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 >= 1.21.1, <= 1.22
     assert major == 1
     assert minor >= 21
     assert minor <= 22

From 667896c557718114fcb1c365f29e5d04413bff84 Mon Sep 17 00:00:00 2001
From: jonathan vanasco <jonathan@2xlp.com>
Date: Wed, 26 Jul 2017 15:29:32 -0400
Subject: [PATCH 11/12] some docs on request redirect detection

---
 requests/sessions.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/requests/sessions.py b/requests/sessions.py
index 8c06448e..6570e733 100644
--- a/requests/sessions.py
+++ b/requests/sessions.py
@@ -97,6 +97,12 @@ class SessionRedirectMixin(object):
 
     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
+        # on each subsequent redirect response (if any).
+        # 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 resp.is_redirect:
             location = resp.headers['location']
             # Currently the underlying http module on py3 decode headers

From e2f5a135c3048d7e6d0b2907ea8811c6943740d3 Mon Sep 17 00:00:00 2001
From: Mark Szymanski <mark@blueye.com>
Date: Wed, 26 Jul 2017 19:21:45 -0500
Subject: [PATCH 12/12] remove legacy super() call

---
 requests/models.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/requests/models.py b/requests/models.py
index 2148024f..4041cac3 100644
--- a/requests/models.py
+++ b/requests/models.py
@@ -586,8 +586,6 @@ class Response(object):
     ]
 
     def __init__(self):
-        super(Response, self).__init__()
-
         self._content = False
         self._content_consumed = False
         self._next = None