Merge branch 'master' into 415-altendky-deprecation_warnings

jmadler · web-flow · commit 83b22745545b · 2019-05-06T15:54:08.000-04:00
diff --git a/TESTING.txt b/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
diff --git a/docs/compatible_idioms.rst b/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
 
diff --git a/docs/credits.rst b/docs/credits.rst
@@ -50,6 +50,7 @@ Python-Future is largely written by Ed Schofield <ed@pythoncharmers.com> 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 <ed@pythoncharmers.com> with th
 - Jeff Tratner
 - Tim Tröndle
 - Brad Walker
-- cclaus (GiHub user)
 - lsm (GiHub user)
 - Mystic-Mirage (GitHub user)
 - str4d (GitHub user)
diff --git a/docs/futurize_overview.rst b/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.
diff --git a/setup.py b/setup.py
@@ -46,7 +46,6 @@
             "past.builtins",
             "past.types",
             "past.utils",
-            # "past.tests",
             "past.translation",
             "libfuturize",
             "libfuturize.fixes",
diff --git a/src/future/backports/__init__.py b/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()
 
 
diff --git a/src/future/backports/email/message.py b/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)
diff --git a/src/future/backports/http/cookiejar.py b/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
diff --git a/src/future/backports/http/cookies.py b/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"]
diff --git a/src/future/moves/__init__.py b/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()
diff --git a/src/future/moves/urllib/request.py b/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():
diff --git a/src/future/tests/base.py b/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):
diff --git a/src/future/types/newstr.py b/src/future/types/newstr.py
@@ -105,6 +105,7 @@ def __repr__(self):
         """
         Without the u prefix
         """
+
         value = super(newstr, self).__repr__()
         # assert value[0] == u'u'
         return value[1:]
@@ -292,6 +293,13 @@ def __eq__(self, other):
         else:
             return False
 
+    def __hash__(self):
+        if (isinstance(self, unicode) or
+            isinstance(self, bytes) and not isnewbytes(self)):
+            return super(newstr, self).__hash__()
+        else:
+            raise NotImplementedError()
+
     def __ne__(self, other):
         if (isinstance(other, unicode) or
             isinstance(other, bytes) and not isnewbytes(other)):
diff --git a/src/future/utils/__init__.py b/src/future/utils/__init__.py
@@ -55,7 +55,7 @@
 import inspect
 
 
-PY3 = sys.version_info[0] == 3
+PY3 = sys.version_info[0] >= 3
 PY35_PLUS = sys.version_info[0:2] >= (3, 5)
 PY36_PLUS = sys.version_info[0:2] >= (3, 6)
 PY2 = sys.version_info[0] == 2
@@ -443,12 +443,14 @@ def raise_from(exc, cause):
         e.__suppress_context__ = False
         if isinstance(cause, type) and issubclass(cause, Exception):
             e.__cause__ = cause()
+            e.__cause__.__traceback__ = sys.exc_info()[2]
             e.__suppress_context__ = True
         elif cause is None:
             e.__cause__ = None
             e.__suppress_context__ = True
         elif isinstance(cause, BaseException):
             e.__cause__ = cause
+            e.__cause__.__traceback__ = sys.exc_info()[2]
             e.__suppress_context__ = True
         else:
             raise TypeError("exception causes must derive from BaseException")
diff --git a/src/html/parser.py b/src/html/parser.py
@@ -2,7 +2,7 @@
 import sys
 __future_module__ = True
 
-if sys.version_info[0] == 3:
+if sys.version_info[0] >= 3:
     raise ImportError('Cannot import module from python-future source folder')
 else:
     from future.moves.html.parser import *
diff --git a/src/libfuturize/fixes/fix_add__future__imports_except_unicode_literals.py b/src/libfuturize/fixes/fix_add__future__imports_except_unicode_literals.py
@@ -21,6 +21,6 @@ class FixAddFutureImportsExceptUnicodeLiterals(fixer_base.BaseFix):
 
     def transform(self, node, results):
         # Reverse order:
-        future_import(u"print_function", node)
-        future_import(u"division", node)
         future_import(u"absolute_import", node)
+        future_import(u"division", node)
+        future_import(u"print_function", node)
diff --git a/src/libfuturize/fixes/fix_division_safe.py b/src/libfuturize/fixes/fix_division_safe.py
@@ -14,10 +14,8 @@
 """
 
 import re
-import lib2to3.pytree as pytree
 from lib2to3.fixer_util import Leaf, Node, Comma
 from lib2to3 import fixer_base
-from lib2to3.fixer_util import syms, does_tree_import
 from libfuturize.fixer_util import (token, future_import, touch_import_top,
                                     wrap_in_fn_call)
 
@@ -33,8 +31,8 @@ def match_division(node):
 
 const_re = re.compile('^[0-9]*[.][0-9]*$')
 
-def is_floaty(node, div_idx):
-    return _is_floaty(node.children[0:div_idx]) or _is_floaty(node.children[div_idx+1:])
+def is_floaty(node):
+    return _is_floaty(node.prev_sibling) or _is_floaty(node.next_sibling)
 
 
 def _is_floaty(expr):
@@ -50,24 +48,6 @@ def _is_floaty(expr):
             return expr.children[0].value == u'float'
     return False
 
-def find_division(node):
-    for i, child in enumerate(node.children):
-        if match_division(child):
-            return i
-    return False
-
-def clone_div_operands(node, div_idx):
-    children = []
-    for i, child in enumerate(node.children):
-        if i == div_idx:
-            children.append(Comma())
-        else:
-            children.append(child.clone())
-
-    # Strip any leading space for the first number:
-    children[0].prefix = u''
-
-    return children
 
 class FixDivisionSafe(fixer_base.BaseFix):
     # BM_compatible = True
@@ -92,18 +72,33 @@ def match(self, node):
         matches, we can start discarding matches after the first.
         """
         if node.type == self.syms.term:
-            div_idx = find_division(node)
-            if div_idx is not False:
-                # if expr1 or expr2 are obviously floats, we don't need to wrap in
-                # old_div, as the behavior of division between any number and a float
-                # should be the same in 2 or 3
-                if not is_floaty(node, div_idx):
-                    return clone_div_operands(node, div_idx)
+            matched = False
+            skip = False
+            children = []
+            for child in node.children:
+                if skip:
+                    skip = False
+                    continue
+                if match_division(child) and not is_floaty(child):
+                    matched = True
+
+                    # Strip any leading space for the first number:
+                    children[0].prefix = u''
+
+                    children = [wrap_in_fn_call("old_div",
+                                                children + [Comma(), child.next_sibling.clone()],
+                                                prefix=node.prefix)]
+                    skip = True
+                else:
+                    children.append(child.clone())
+            if matched:
+                return Node(node.type, children, fixers_applied=node.fixers_applied)
+
         return False
 
     def transform(self, node, results):
         if self.skip:
             return
         future_import(u"division", node)
         touch_import_top(u'past.utils', u'old_div', node)
-        return wrap_in_fn_call("old_div", results, prefix=node.prefix)
+        return results
diff --git a/src/libpasteurize/fixes/fix_add_all__future__imports.py b/src/libpasteurize/fixes/fix_add_all__future__imports.py
@@ -18,7 +18,7 @@ class FixAddAllFutureImports(fixer_base.BaseFix):
     run_order = 1
 
     def transform(self, node, results):
-        future_import(u"unicode_literals", node)
-        future_import(u"print_function", node)
-        future_import(u"division", node)
         future_import(u"absolute_import", node)
+        future_import(u"division", node)
+        future_import(u"print_function", node)
+        future_import(u"unicode_literals", node)
diff --git a/src/past/builtins/misc.py b/src/past/builtins/misc.py
@@ -1,5 +1,5 @@
 from __future__ import unicode_literals
-import sys
+
 import inspect
 
 from future.utils import PY2, PY3, exec_
@@ -9,9 +9,9 @@
 else:
     from collections.abc import Mapping
 
-
 if PY3:
     import builtins
+    from collections.abc import Mapping
 
     def apply(f, *args, **kw):
         return f(*args, **kw)
@@ -48,6 +48,7 @@ def oct(number):
     xrange = range
 else:
     import __builtin__
+    from collections import Mapping
     apply = __builtin__.apply
     chr = __builtin__.chr
     cmp = __builtin__.cmp
diff --git a/src/past/builtins/noniterators.py b/src/past/builtins/noniterators.py
@@ -72,7 +72,7 @@ def oldmap(func, *iterables):
         >>> oldmap(None, range(4))
         [0, 1, 2, 3]
 
-        More test cases are in past.tests.test_builtins.
+        More test cases are in test_past.test_builtins.
         """
         zipped = itertools.zip_longest(*iterables)
         l = list(zipped)
diff --git a/src/past/tests/__init__.py b/src/past/tests/__init__.py
diff --git a/src/past/translation/__init__.py b/src/past/translation/__init__.py
@@ -432,7 +432,7 @@ def install_hooks(include_paths=(), exclude_paths=()):
     _hook.include(include_paths)
     _hook.exclude(exclude_paths)
     # _hook.debug = debug
-    enable = sys.version_info[0] >= 3   # enabled for all 3.x
+    enable = sys.version_info[0] >= 3   # enabled for all 3.x+
     if enable and _hook not in sys.meta_path:
         sys.meta_path.insert(0, _hook)  # insert at beginning. This could be made a parameter
 
diff --git a/src/past/types/oldstr.py b/src/past/types/oldstr.py
@@ -11,7 +11,6 @@
 else:
     from collections.abc import Iterable
 
-
 _builtin_bytes = bytes
 
 
diff --git a/src/past/utils/__init__.py b/src/past/utils/__init__.py
@@ -16,7 +16,7 @@
 import sys
 import numbers
 
-PY3 = sys.version_info[0] == 3
+PY3 = sys.version_info[0] >= 3
 PY2 = sys.version_info[0] == 2
 PYPY = hasattr(sys, 'pypy_translation_info')
 
diff --git a/tests/test_future/test_email_multipart.py b/tests/test_future/test_email_multipart.py
diff --git a/tests/test_future/test_futurize.py b/tests/test_future/test_futurize.py
diff --git a/tests/test_future/test_str.py b/tests/test_future/test_str.py
diff --git a/tests/test_future/test_utils.py b/tests/test_future/test_utils.py

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,8 @@`
`138`	`138`	`# Import our required modules`
`139`	`139`	`#`
`140`	`140`	`import re`
`141`		`-re.ASCII = 0 # for py2 compatibility`
	`141`	`+if PY2:`
	`142`	`+ re.ASCII = 0 # for py2 compatibility`
`142`	`143`	`import string`
`143`	`144`
`144`	`145`	`__all__ = ["CookieError", "BaseCookie", "SimpleCookie"]`