Py2.6 compatibility: use 3-argument create_connection() from future.backports.socket (issue #162)

Author: edschofield

docs/whatsnew.rst

@@ -9,6 +9,7 @@ What's new in version 0.15.1 (in development)
 =============================================
 
 - ``futurize``: Moved exec fixer to stage1. The forward-compatible ``exec(a, b)`` idiom is supported in Python 2.6 and 2.7. See https://docs.python.org/2/reference/simple_stmts.html#exec.
+- Use 3-argument socket.create_connection() backport to restore Py2.6 compatibility in ``urllib.request.urlopen()`` (issue #162)
 
 
 What's new in version 0.15.0 (2015-07-25)

src/future/backports/__init__.py

@@ -1,12 +1,19 @@
-# future.backports package
+"""
+future.backports package
+"""
+
 from __future__ import absolute_import
+
 import sys
+
 __future_module__ = True
 from future.standard_library import import_top_level_modules
 
+
 if sys.version_info[0] == 3:
     import_top_level_modules()
 
+
 from .misc import (ceil,
                    OrderedDict,
                    Counter,

src/future/backports/http/client.py

@@ -75,6 +75,7 @@
 
 from future.backports.email import parser as email_parser
 from future.backports.email import message as email_message
+from future.backports.socket import create_connection as socket_create_connection
 import io
 import os
 import socket
@@ -843,7 +844,7 @@ def _tunnel(self):
 
     def connect(self):
         """Connect to the host and port specified in __init__."""
-        self.sock = socket.create_connection((self.host,self.port),
+        self.sock = socket_create_connection((self.host,self.port),
                                              self.timeout, self.source_address)
         if self._tunnel_host:
             self._tunnel()
@@ -1226,7 +1227,7 @@ def __init__(self, host, port=None, key_file=None, cert_file=None,
         def connect(self):
             "Connect to a host on a given (SSL) port."
 
-            sock = socket.create_connection((self.host, self.port),
+            sock = socket_create_connection((self.host, self.port),
                                             self.timeout, self.source_address)
 
             if self._tunnel_host:
@@ -1266,7 +1267,7 @@ def connect(self):
     #     def connect(self):
     #         "Connect to a host on a given (SSL) port."
 
-    #         sock = socket.create_connection((self.host, self.port),
+    #         sock = socket_create_connection((self.host, self.port),
     #                                         self.timeout, self.source_address)
     #         if self._tunnel_host:
     #             self.sock = sock

src/future/backports/misc.py

@@ -10,6 +10,7 @@
 - subprocess.check_output  (for Python 2.6)
 - reprlib.recursive_repr   (for Python 2.6+)
 """
+from __future__ import absolute_import
 
 import subprocess
 from math import ceil as oldceil

src/future/tests/base.py

@@ -1,4 +1,4 @@
-from __future__ import print_function
+from __future__ import print_function, absolute_import
 import os
 import tempfile
 import unittest
@@ -362,6 +362,9 @@ def _run_test_script(self, filename='mytestscript.py',
                         fn,
                         '----\n%s\n----' % f.read(),
                     )
+            if not hasattr(e, 'output'):
+                # The attribute CalledProcessError.output doesn't exist on Py2.6
+                e.output = None
             raise VerboseCalledProcessError(msg, e.returncode, e.cmd, output=e.output)
         return output
 

src/future/types/newrange.py

@@ -17,6 +17,7 @@
     Read more at
         https://late.am/post/2012/06/18/what-the-heck-is-an-xrange
 """
+from __future__ import absolute_import
 
 from collections import Sequence, Iterator
 from itertools import islice