summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHugo <hugovk@users.noreply.github.com>2018-08-24 21:49:13 +0300
committerSeth M. Larson <sethmichaellarson@gmail.com>2018-08-24 13:49:13 -0500
commit17d3828ba64eefa50c9a28a2e42279b09ac6cdec (patch)
treeb43ceab314e92c446fe9ee7b2cf8c6b3d747fe1c
parenta6c11c13e4759797d7e31ace4b0ae9521fb16c06 (diff)
downloadurllib3-17d3828ba64eefa50c9a28a2e42279b09ac6cdec.tar.gz
Update CHANGES and CONTRIBUTORS for Python 2.6 removal (#1431)
-rw-r--r--CHANGES.rst6
-rw-r--r--CONTRIBUTORS.txt13
2 files changed, 12 insertions, 7 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 683001c0..3d19f8ec 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -6,11 +6,13 @@ dev (master)
* Skip DNS names that can't be idna-decoded when using pyOpenSSL (Issue #1405).
-* ... [Short description of non-trivial change.] (Issue #)
-
* Add a server_hostname parameter to HTTPSConnection which allows for
overriding the SNI hostname sent in the handshake. (Pull #1397)
+* Drop support for EOL Python 2.6 (Pull #1429 and Pull #1430)
+
+* ... [Short description of non-trivial change.] (Issue #)
+
1.23 (2018-06-05)
-----------------
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index c2cb21be..733e8fbd 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -30,7 +30,7 @@ In chronological order:
* kennethreitz <me@kennethreitz.com>
* Bugfixes, suggestions, Requests integration
-* georgemarshall <http://github.com/georgemarshall>
+* georgemarshall <https://github.com/georgemarshall>
* Bugfixes, Improvements and Test coverage
* Thomas Kluyver <thomas@kluyver.me.uk>
@@ -67,7 +67,7 @@ In chronological order:
* Boris Figovsky <boris.figovsky@ravellosystems.com>
* Allowed to skip SSL hostname verification
-* Cory Benfield <http://lukasa.co.uk/about/>
+* Cory Benfield <https://lukasa.co.uk/about/>
* Stream method for Response objects.
* Return native strings in header values.
* Generate 'Host' header when using proxies.
@@ -96,7 +96,7 @@ In chronological order:
* Nipunn Koorapati <nipunn1313@gmail.com>
* Ignore default ports when comparing hosts for equality
-* Danilo @dbrgn <http://dbrgn.ch/>
+* Danilo @dbrgn <https://dbrgn.ch/>
* Disabled TLS compression by default on Python 3.2+
* Disabled TLS compression in pyopenssl contrib module
* Configurable cipher suites in pyopenssl contrib module
@@ -114,7 +114,7 @@ In chronological order:
* Tahia Khan <http://tahia.tk/>
* Added Timeout examples in docs
-* Arthur Grunseid <http://grunseid.com>
+* Arthur Grunseid <https://grunseid.com>
* source_address support and tests (with https://github.com/bui)
* Ian Cordasco <graffatcolmingov@gmail.com>
@@ -259,8 +259,11 @@ In chronological order:
* Improve contribution guide
* Add ``HTTPResponse.geturl`` method to provide ``urllib2.urlopen().geturl()`` behavior
-* Bruce Merry <http://www.brucemerry.org.za>
+* Bruce Merry <https://www.brucemerry.org.za>
* Fix leaking exceptions when system calls are interrupted with zero timeout
+* Hugo van Kemenade <https://github.com/hugovk>
+ * Drop support for EOL Python 2.6
+
* [Your name or handle] <[email or website]>
* [Brief summary of your changes]