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:]

src/future/backports/http/cookiejar.py

@@ -33,15 +33,16 @@
 from __future__ import division
 from __future__ import absolute_import
 from future.builtins import filter, int, map, open, str
-from future.utils import as_native_str
+from future.utils import as_native_str, PY2
 
 __all__ = ['Cookie', 'CookieJar', 'CookiePolicy', 'DefaultCookiePolicy',
            'FileCookieJar', 'LWPCookieJar', 'LoadError', 'MozillaCookieJar']
 
 import copy
 import datetime
 import re
-re.ASCII = 0
+if PY2:
+    re.ASCII = 0
 import time
 from future.backports.urllib.parse import urlparse, urlsplit, quote
 from future.backports.http.client import HTTP_PORT

src/future/backports/http/cookies.py

@@ -138,7 +138,8 @@
 # Import our required modules
 #
 import re
-re.ASCII = 0    # for py2 compatibility
+if PY2:
+    re.ASCII = 0    # for py2 compatibility
 import string
 
 __all__ = ["CookieError", "BaseCookie", "SimpleCookie"]

src/future/backports/misc.py

@@ -16,7 +16,6 @@
 
 import subprocess
 from math import ceil as oldceil
-from collections import Mapping, MutableMapping
 
 from operator import itemgetter as _itemgetter, eq as _eq
 import sys
@@ -25,7 +24,12 @@
 from itertools import repeat as _repeat, chain as _chain, starmap as _starmap
 from socket import getaddrinfo, SOCK_STREAM, error, socket
 
-from future.utils import iteritems, itervalues, PY26, PY3
+from future.utils import iteritems, itervalues, PY2, PY26, PY3
+
+if PY2:
+    from collections import Mapping, MutableMapping
+else:
+    from collections.abc import Mapping, MutableMapping
 
 
 def ceil(x):

src/future/backports/urllib/request.py

@@ -109,11 +109,17 @@
 import socket
 import sys
 import time
-import collections
 import tempfile
 import contextlib
 import warnings
 
+from future.utils import PY2
+
+if PY2:
+    from collections import Iterable
+else:
+    from collections.abc import Iterable
+
 # check for SSL
 try:
     import ssl
@@ -1221,7 +1227,7 @@ def do_request_(self, request):
                         mv = memoryview(data)
                         size = len(mv) * mv.itemsize
                 except TypeError:
-                    if isinstance(data, collections.Iterable):
+                    if isinstance(data, Iterable):
                         raise ValueError("Content-Length should be specified "
                                 "for iterable data of type %r %r" % (type(data),
                                 data))

src/future/builtins/__init__.py

@@ -11,7 +11,7 @@
 # The isinstance import is no longer needed. We provide it only for
 # backward-compatibility with future v0.8.2. It will be removed in future v1.0.
 from future.builtins.misc import (ascii, chr, hex, input, isinstance, next,
-                                  oct, open, pow, round, super)
+                                  oct, open, pow, round, super, max, min)
 from future.utils import PY3
 
 if PY3:
@@ -43,7 +43,7 @@
     __all__ = ['filter', 'map', 'zip',
                'ascii', 'chr', 'hex', 'input', 'next', 'oct', 'open', 'pow',
                'round', 'super',
-               'bytes', 'dict', 'int', 'list', 'object', 'range', 'str',
+               'bytes', 'dict', 'int', 'list', 'object', 'range', 'str', 'max', 'min'
               ]
 
 else:

src/future/builtins/misc.py

@@ -13,6 +13,8 @@
 - ``open`` (equivalent to io.open on Py2)
 - ``super`` (backport of Py3's magic zero-argument super() function
 - ``round`` (new "Banker's Rounding" behaviour from Py3)
+- ``max`` (new default option from Py3.4)
+- ``min`` (new default option from Py3.4)
 
 ``isinstance`` is also currently exported for backwards compatibility
 with v0.8.2, although this has been deprecated since v0.9.
@@ -59,6 +61,8 @@
     from future.builtins.newnext import newnext as next
     from future.builtins.newround import newround as round
     from future.builtins.newsuper import newsuper as super
+    from future.builtins.new_min_max import newmax as max
+    from future.builtins.new_min_max import newmin as min
     from future.types.newint import newint
 
     _SENTINEL = object()
@@ -89,11 +93,12 @@ def pow(x, y, z=_SENTINEL):
             else:
                 return _builtin_pow(x+0j, y, z)
 
+
     # ``future`` doesn't support Py3.0/3.1. If we ever did, we'd add this:
     #     callable = __builtin__.callable
 
     __all__ = ['ascii', 'chr', 'hex', 'input', 'isinstance', 'next', 'oct',
-               'open', 'pow', 'round', 'super']
+               'open', 'pow', 'round', 'super', 'max', 'min']
 
 else:
     import builtins
@@ -109,8 +114,14 @@ def pow(x, y, z=_SENTINEL):
     pow = builtins.pow
     round = builtins.round
     super = builtins.super
-
-    __all__ = []
+    if utils.PY34_PLUS:
+        max = builtins.max
+        min = builtins.min
+        __all__ = []
+    else:
+        from future.builtins.new_min_max import newmax as max
+        from future.builtins.new_min_max import newmin as min
+        __all__ = ['min', 'max']
 
     # The callable() function was removed from Py3.0 and 3.1 and
     # reintroduced into Py3.2+. ``future`` doesn't support Py3.0/3.1. If we ever

src/future/builtins/new_min_max.py

@@ -0,0 +1,52 @@
+from future import utils
+if utils.PY2:
+    from __builtin__ import max as _builtin_max, min as _builtin_min
+else:
+    from builtins import max as _builtin_max, min as _builtin_min
+
+
+def newmin(*args, **kwargs):
+    return new_min_max(_builtin_min, *args, **kwargs)
+
+
+def newmax(*args, **kwargs):
+    return new_min_max(_builtin_max, *args, **kwargs)
+
+
+def new_min_max(_builtin_func, *args, **kwargs):
+    """
+    To support the argument "default" introduced in python 3.4 for min and max
+    :param _builtin_func: builtin min or builtin max
+    :param args:
+    :param kwargs:
+    :return: returns the min or max based on the arguments passed
+    """
+
+    for key, _ in kwargs.items():
+        if key not in set(['key', 'default']):
+            raise TypeError('Illegal argument %s', key)
+
+    if len(args) == 0:
+        raise TypeError
+
+    if len(args) != 1 and kwargs.get('default') is not None:
+        raise TypeError
+
+    if len(args) == 1:
+        try:
+            next(iter(args[0]))
+        except StopIteration:
+            if kwargs.get('default') is not None:
+                return kwargs.get('default')
+            else:
+                raise ValueError('iterable is an empty sequence')
+        if kwargs.get('key') is not None:
+            return _builtin_func(args[0], key=kwargs.get('key'))
+        else:
+            return _builtin_func(args[0])
+
+    if len(args) > 1:
+        if kwargs.get('key') is not None:
+            return _builtin_func(args, key=kwargs.get('key'))
+        else:
+            return _builtin_func(args)

src/future/moves/__init__.py

@@ -4,5 +4,5 @@
 __future_module__ = True
 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/moves/urllib/request.py

@@ -11,19 +11,8 @@
                                 proxy_bypass,
                                 quote,
                                 request_host,
-                                splitattr,
-                                splithost,
-                                splitpasswd,
-                                splitport,
-                                splitquery,
-                                splittag,
-                                splittype,
-                                splituser,
-                                splitvalue,
                                 thishost,
-                                to_bytes,
                                 unquote,
-                                unwrap,
                                 url2pathname,
                                 urlcleanup,
                                 urljoin,
@@ -32,6 +21,18 @@
                                 urlretrieve,
                                 urlsplit,
                                 urlunparse)
+
+    from urllib.parse import (splitattr,
+                              splithost,
+                              splitpasswd,
+                              splitport,
+                              splitquery,
+                              splittag,
+                              splittype,
+                              splituser,
+                              splitvalue,
+                              to_bytes,
+                              unwrap)
 else:
     __future_module__ = True
     with suspend_hooks():

src/future/tests/base.py

@@ -272,7 +272,11 @@ def convert_check(self, before, expected, stages=(1, 2), all_imports=False,
         else:
             headers = ''
 
-        self.compare(output, headers + reformat_code(expected),
+        reformatted = reformat_code(expected)
+        if headers in reformatted:
+            headers = ''
+
+        self.compare(output, headers + reformatted,
                      ignore_imports=ignore_imports)
 
     def unchanged(self, code, **kwargs):