Merge branch 'master' into patch-3

Author: jmadler

TESTING.txt

@@ -4,4 +4,10 @@ The test suite can be run with:
 
     $ tox
 
-which tests the module under a number of different python versions, where available.
+which tests the module under a number of different python versions, where available, or with:
+
+    $ py.test
+
+To execute a single test:
+
+    $ pytest -k test_chained_exceptions_stacktrace

docs/compatible_idioms.rst

@@ -1270,7 +1270,7 @@ urllib module
 ~~~~~~~~~~~~~
 
 ``urllib`` is the hardest module to use from Python 2/3 compatible code.
-You may like to use Requests (http://python-requests.org) instead.
+You might want to switch to Requests (http://python-requests.org) instead.
 
 .. code:: python
 

docs/credits.rst

@@ -50,6 +50,7 @@ Python-Future is largely written by Ed Schofield <[email protected]> with th
 - Grant Bakker
 - Jacob Beck
 - Nate Bogdanowicz
+- Christian Clauss
 - Denis Cornehl
 - Nicolas Delaby
 - Jon Dufresne
@@ -79,7 +80,6 @@ Python-Future is largely written by Ed Schofield <[email protected]> with th
 - Jeff Tratner
 - Tim Tröndle
 - Brad Walker
-- cclaus (GiHub user)
 - lsm (GiHub user)
 - Mystic-Mirage (GitHub user)
 - str4d (GitHub user)

docs/futurize.rst

@@ -237,7 +237,7 @@ The complete list of fixers applied in Stage 2 is::
     lib2to3.fixes.fix_operator
     lib2to3.fixes.fix_raw_input
     lib2to3.fixes.fix_zip
-    
+
     libfuturize.fixes.fix_basestring
     libfuturize.fixes.fix_cmp
     libfuturize.fixes.fix_division_safe
@@ -269,6 +269,7 @@ Not applied::
     lib2to3.fixes.fix_xrange    # Custom one because of a bug with Py3.3's lib2to3
 
 
+
 .. Ideally the output of this stage should not be a ``SyntaxError`` on either
 .. Python 3 or Python 2.
 

docs/futurize_overview.rst

@@ -51,5 +51,5 @@ use the ``-w`` flag.
 
 For complex projects, it is probably best to divide the porting into two stages.
 Stage 1 is for "safe" changes that modernize the code but do not break Python
-2.7 compatibility or introduce a depdendency on the ``future`` package. Stage 2
+2.7 compatibility or introduce a dependency on the ``future`` package. Stage 2
 is to complete the process.

docs/notebooks/Writing Python 2-3 compatible code.ipynb

@@ -1747,7 +1747,7 @@
    "source": [
     "# Python 2 and 3: option 3\n",
     "try:\n",
-    "    import itertools.imap as map\n",
+    "    from itertools import imap as map\n",
     "except ImportError:\n",
     "    pass\n",
     "\n",
@@ -1845,7 +1845,7 @@
    "source": [
     "# Python 2 and 3: option 2\n",
     "try:\n",
-    "    import itertools.imap as map\n",
+    "    from itertools import imap as map\n",
     "except ImportError:\n",
     "    pass\n",
     "\n",

setup.py

@@ -46,7 +46,6 @@
             "past.builtins",
             "past.types",
             "past.utils",
-            # "past.tests",
             "past.translation",
             "libfuturize",
             "libfuturize.fixes",

src/future/backports/__init__.py

@@ -10,7 +10,7 @@
 from future.standard_library import import_top_level_modules
 
 
-if sys.version_info[0] == 3:
+if sys.version_info[0] >= 3:
     import_top_level_modules()
 
 

src/future/backports/email/message.py

@@ -800,7 +800,7 @@ def set_boundary(self, boundary):
             # There was no Content-Type header, and we don't know what type
             # to set it to, so raise an exception.
             raise errors.HeaderParseError('No Content-Type header found')
-        newparams = []
+        newparams = list()
         foundp = False
         for pk, pv in params:
             if pk.lower() == 'boundary':
@@ -814,10 +814,10 @@ def set_boundary(self, boundary):
             # instead???
             newparams.append(('boundary', '"%s"' % boundary))
         # Replace the existing Content-Type header with the new value
-        newheaders = []
+        newheaders = list()
         for h, v in self._headers:
             if h.lower() == 'content-type':
-                parts = []
+                parts = list()
                 for k, v in newparams:
                     if v == '':
                         parts.append(k)

src/future/backports/http/client.py

@@ -696,9 +696,19 @@ def _safe_readinto(self, b):
         while total_bytes < len(b):
             if MAXAMOUNT < len(mvb):
                 temp_mvb = mvb[0:MAXAMOUNT]
-                n = self.fp.readinto(temp_mvb)
+                if PY2:
+                    data = self.fp.read(len(temp_mvb))
+                    n = len(data)
+                    temp_mvb[:n] = data
+                else:
+                    n = self.fp.readinto(temp_mvb)
             else:
-                n = self.fp.readinto(mvb)
+                if PY2:
+                    data = self.fp.read(len(mvb))
+                    n = len(data)
+                    mvb[:n] = data
+                else:
+                    n = self.fp.readinto(mvb)
             if not n:
                 raise IncompleteRead(bytes(mvb[0:total_bytes]), len(b))
             mvb = mvb[n:]