Merge from master

.travis.yml

@@ -14,30 +14,32 @@ notifications:
   email: false
 env:
   global:
-    - GAE_PYTHONPATH=${HOME}/.cache/google_appengine
+    - GAE_SDK_PATH=${HOME}/.cache/google_appengine
     - PYTHONWARNINGS=always::DeprecationWarning
   matrix:
     - TOXENV=flake8-py3
-    - TOXENV=py27
-    - TOXENV=py33
-    - TOXENV=py34
     - TOXENV=gae
     - TOXENV=docs
 # https://github.com/travis-ci/travis-ci/issues/4794
 matrix:
   include:
+    - python: 2.7
+      env: TOXENV=py27
+    - python: 3.4
+      env: TOXENV=py34
     - python: 3.5
       env: TOXENV=py35
     - python: 3.6
       env: TOXENV=py36
-    - python: pypy-5.4
+    - python: 3.7-dev
+      env: TOXENV=py37
+    - python: pypy2.7
       env: TOXENV=pypy
+    - python: pypy3.5
+      env: TOXENV=pypy3
     - language: generic
       os: osx
       env: TOXENV=py27
-    - language: generic
-      os: osx
-      env: TOXENV=py33
     - language: generic
       os: osx
       env: TOXENV=py34
@@ -47,7 +49,11 @@ matrix:
     - language: generic
       os: osx
       env: TOXENV=py36
+    - language: generic
+      os: osx
+      env: TOXENV=py37
   allow_failures:
-  - python: pypy-5.4
   - env: TOXENV=gae
+  - python: 3.7-dev
+  - env: TOXENV=py37
 sudo: false

CHANGES.rst

@@ -30,10 +30,52 @@ Upcoming 2.0 Changes
 dev (master)
 ------------
 
+* Fix ``util.selectors._fileobj_to_fd`` to accept ``long`` (Issue #1247).
+
+* Dropped Python 3.3 support. (Pull #1242)
+
+* Put the connection back in the pool when calling stream() or read_chunked() on
+  a chunked HEAD response. (Issue #1234)
+
+* Fixed pyOpenSSL-specific ssl client authentication issue when clients
+  attempted to auth via certificate + chain (Issue #1060)
+
+* Add the port to the connectionpool connect print (Pull #1251)
+
+* Lazily load `uuid` to boost performance on imports (Pull #1270)
+
+* ... [Short description of non-trivial change.] (Issue #)
+
+
+1.22 (2017-07-20)
+-----------------
+
+* Fixed missing brackets in ``HTTP CONNECT`` when connecting to IPv6 address via
+  IPv6 proxy. (Issue #1222)
+
+* Made the connection pool retry on ``SSLError``.  The original ``SSLError``
+  is available on ``MaxRetryError.reason``. (Issue #1112)
+
+* Drain and release connection before recursing on retry/redirect.  Fixes
+  deadlocks with a blocking connectionpool. (Issue #1167)
+
+* Fixed compatibility for cookiejar. (Issue #1229)
+
+* pyopenssl: Use vendored version of ``six``. (Issue #1231)
+
+
+1.21.1 (2017-05-02)
+-------------------
+
 * Fixed SecureTransport issue that would cause long delays in response body
   delivery. (Pull #1154)
 
-* ... [Short description of non-trivial change.] (Issue #)
+* Fixed regression in 1.21 that threw exceptions when users passed the
+  ``socket_options`` flag to the ``PoolManager``.  (Issue #1165)
+
+* Fixed regression in 1.21 that threw exceptions when users passed the
+  ``assert_hostname`` or ``assert_fingerprint`` flag to the ``PoolManager``.
+  (Pull #1157)
 
 
 1.21 (2017-04-25)
@@ -68,8 +110,6 @@ dev (master)
   leaves them unchanged.
   (Issue #1080)
 
-* ... [Short description of non-trivial change.] (Issue #)
-
 
 1.20 (2017-01-19)
 -----------------
@@ -858,7 +898,7 @@ dev (master)
 * Refactored code to be even more decoupled, reusable, and extendable.
 * License header added to ``.py`` files.
 * Embiggened the documentation: Lots of Sphinx-friendly docstrings in the code
-  and docs in ``docs/`` and on urllib3.readthedocs.org.
+  and docs in ``docs/`` and on https://urllib3.readthedocs.io/.
 * Embettered all the things!
 * Started writing this file.
 

CONTRIBUTORS.txt

@@ -230,5 +230,24 @@ In chronological order:
 * Tuukka Mustonen <tuukka.mustonen@gmail.com>
   * Add counter for status_forcelist retries.
 
+* Erik Rose <erik@mozilla.com>
+  * Bugfix to pyopenssl vendoring
+
+* Wolfgang Richter <wolfgang.richter@gmail.com>
+  * Bugfix related to loading full certificate chains with PyOpenSSL backend.
+
+* Mike Miller <github@mikeage.net>
+  * Logging improvements to include the HTTP(S) port when opening a new connection
+
+* Ioannis Tziakos <mail@itziakos.gr>
+  * Fix ``util.selectors._fileobj_to_fd`` to accept ``long``.
+  * Update appveyor tox setup to use the 64bit python.
+
+* Akamai (through Jesse Shapiro) <jshapiro@akamai.com>
+  * Ongoing maintenance
+
+* Dominique Leuenberger <dimstar@opensuse.org>
+  * Minor fixes in the test suite
+
 * [Your name or handle] <[email or website]>
   * [Brief summary of your changes]

Makefile

@@ -41,7 +41,7 @@ clean:
 
 .PHONY: test
 test: requirements
-	nosetests
+	tox
 
 .PHONY: test-all
 test-all: requirements

README.rst

@@ -49,6 +49,7 @@ urllib3 is powerful and easy to use::
     >>> r.data
     'User-agent: *\nDisallow: /deny\n'
 
+
 Installing
 ----------
 
@@ -75,17 +76,25 @@ urllib3 happily accepts contributions. Please see our
 `contributing documentation <https://urllib3.readthedocs.io/en/latest/contributing.html>`_
 for some tips on getting started.
 
+
 Maintainers
 -----------
 
+- `@haikuginger <https://github.com/haikuginger>`_ (Jesse Shapiro)
 - `@lukasa <https://github.com/lukasa>`_ (Cory Benfield)
 - `@sigmavirus24 <https://github.com/sigmavirus24>`_ (Ian Cordasco)
 - `@shazow <https://github.com/shazow>`_ (Andrey Petrov)
 
 👋
 
+
 Sponsorship
 -----------
 
 If your company benefits from this library, please consider `sponsoring its
 development <https://urllib3.readthedocs.io/en/latest/contributing.html#sponsorship>`_.
+
+Sponsors include:
+
+- Akamai (2017-present), sponsors `@haikuginger <https://github.com/haikuginger>`_'s work on an ongoing basis
+- Hewlett Packard Enterprise (2016-2017), sponsored `@Lukasa’s <https://github.com/Lukasa>`_ work on urllib3

_travis/install.sh

@@ -18,24 +18,28 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
 
     case "${TOXENV}" in
         py27)
-            curl -O https://bootstrap.pypa.io/get-pip.py
-            python get-pip.py --user
+            pyenv install 2.7.14
+            pyenv global 2.7.14
             ;;
         py33)
             pyenv install 3.3.6
             pyenv global 3.3.6
             ;;
         py34)
-            pyenv install 3.4.5
-            pyenv global 3.4.5
+            pyenv install 3.4.7
+            pyenv global 3.4.7
             ;;
         py35)
-            pyenv install 3.5.2
-            pyenv global 3.5.2
+            pyenv install 3.5.4
+            pyenv global 3.5.4
             ;;
         py36)
-            pyenv install 3.6.0
-            pyenv global 3.6.0
+            pyenv install 3.6.3
+            pyenv global 3.6.3
+            ;;
+        py37)
+            pyenv install 3.7-dev
+            pyenv global 3.7-dev
             ;;
         pypy*)
             pyenv install "pypy-5.4.1"
@@ -51,6 +55,7 @@ fi
 
 pip install tox
 
-if [[ "${TOXENV}" == "gae" && ! -d ${GAE_PYTHONPATH} ]]; then
-  python _travis/fetch_gae_sdk.py ;
+if [[ "${TOXENV}" == "gae" ]]; then
+    pip install gcp-devrel-py-tools
+    gcp-devrel-py-tools download-appengine-sdk "$(dirname ${GAE_SDK_PATH})"
 fi