Merge pull request docker#1039 from docker/felixonmars-backports

Use backports.ssl_match_hostname

Author: shin-

docker/ssladapter/ssl_match_hostname.py

@@ -18,7 +18,7 @@
 # Monkey-patching match_hostname with a version that supports
 # IP-address checking. Not necessary for Python 3.5 and above
 if sys.version_info[0] < 3 or sys.version_info[1] < 5:
-    from .ssl_match_hostname import match_hostname
+    from backports.ssl_match_hostname import match_hostname
     urllib3.connection.match_hostname = match_hostname
 
 

docker/ssladapter/ssladapter.py

@@ -1,4 +1,5 @@
 requests==2.5.3
 six>=1.4.0
 websocket-client==0.32.0
-py2-ipaddress==3.4.1 ; python_version < '3.2'
+backports.ssl_match_hostname>=3.5 ; python_version < '3.5'
+ipaddress==1.0.16 ; python_version < '3.3'

requirements.txt

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 import os
-import sys
 from setuptools import setup
 
 ROOT_DIR = os.path.dirname(__file__)
@@ -13,7 +12,8 @@
 ]
 
 extras_require = {
-    ':python_version < "3"': 'py2-ipaddress >= 3.4.1',
+    ':python_version < "3.5"': 'backports.ssl_match_hostname >= 3.5',
+    ':python_version < "3.3"': 'ipaddress >= 1.0.16',
 }
 
 exec(open('docker/version.py').read())

setup.py

@@ -1,7 +1,13 @@
 from docker.ssladapter import ssladapter
-from docker.ssladapter.ssl_match_hostname import (
-    match_hostname, CertificateError
-)
+
+try:
+    from backports.ssl_match_hostname import (
+        match_hostname, CertificateError
+    )
+except ImportError:
+    from ssl import (
+        match_hostname, CertificateError
+    )
 
 try:
     from ssl import OP_NO_SSLv3, OP_NO_SSLv2, OP_NO_TLSv1