Merge branch 'master' into bugfix-touch_import_top

Author: omit66

.gitignore

@@ -41,4 +41,3 @@ nosetests.xml
 .mr.developer.cfg
 .project
 .pydevproject
-

.travis.yml

@@ -1,25 +1,41 @@
-language: python
-
-python:
-  - "3.4"
-  - "3.3"
-  - "2.7"
-  - "2.6"
-
 sudo: false
+language: python
+cache: pip
 
-# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
-# These packages only exist on Ubuntu 13.04 and newer:
-# No dependencies currently unless using Python 2.6.
+matrix:
+  include:
+    - python: 2.6
+      env: TOXENV=py26
+    - python: 2.7
+      env: TOXENV=py27
+    - python: 3.3
+      env: TOXENV=py33
+    - python: 3.4
+      env: TOXENV=py34
+    - python: 3.5
+      env: TOXENV=py35
+    - python: 3.6
+      env: TOXENV=py36
+    - python: 3.7
+      env: TOXENV=py37
+      dist: xenial    # required for Python 3.7 (travis-ci/travis-ci#9069)
+      sudo: required  # required for Python 3.7 (travis-ci/travis-ci#9069)
 
 install:
-  - if [[ $TRAVIS_PYTHON_VERSION == 2.6* ]]; then pip install -r requirements_py26.txt --use-mirrors; fi
-  - python setup.py install
+  - pip install tox==2.9.1
+  - pip install virtualenv==15.2.0
+  - pip install py==1.4.30
+  - pip install pluggy==0.5.2
 
-# command to run tests, e.g. python setup.py test
+before_script:
+  # Run flake8 tests only on Python 2.7 and 3.7...
+  # 1) stop the build if there are Python syntax errors or undefined names
+  # 2) exit-zero treats all errors as warnings.  The GitHub editor is 127 chars wide
+  - if [[ $TRAVIS_PYTHON_VERSION == *.7 ]]; then
+      pip install flake8;
+      flake8 . --count --exit-zero --select=E901,E999,F821,F822,F823 --show-source --statistics;
+      flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics; 
+    fi
 
 script:
-  # We might like to get out of the source directory before running tests to
-  # avoid PYTHONPATH confusion? As an example, see here:
-  #     https://github.com/tornadoweb/tornado/blob/master/.travis.yml
-  - python setup.py test
+  - tox

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2016 Python Charmers Pty Ltd, Australia
+Copyright (c) 2013-2018 Python Charmers Pty Ltd, Australia
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

MANIFEST.in

@@ -25,4 +25,3 @@ recursive-include tests *.au
 recursive-include tests *.gif
 recursive-include tests *.py
 recursive-include tests *.txt
-

README.rst

@@ -68,7 +68,7 @@ statements. For example, this code behaves identically on Python 2.6/2.7 after
 these imports as it does on Python 3.3+:
 
 .. code-block:: python
-    
+
     from __future__ import absolute_import, division, print_function
     from builtins import (bytes, str, open, super, range,
                           zip, round, input, int, pow, object)
@@ -93,7 +93,7 @@ these imports as it does on Python 3.3+:
 
     # Extra arguments for the open() function
     f = open('japanese.txt', encoding='utf-8', errors='replace')
-    
+
     # New zero-argument super() function:
     class VerboseList(list):
         def append(self, item):
@@ -103,15 +103,15 @@ these imports as it does on Python 3.3+:
     # New iterable range object with slicing support
     for i in range(10**15)[:10]:
         pass
-    
+
     # Other iterators: map, zip, filter
     my_iter = zip(range(3), ['a', 'b', 'c'])
     assert my_iter != list(my_iter)
-    
+
     # The round() function behaves as it does in Python 3, using
     # "Banker's Rounding" to the nearest even last digit:
     assert round(0.1250, 2) == 0.12
-    
+
     # input() replaces Py2's raw_input() (with no eval()):
     name = input('What is your name? ')
     print('Hello ' + name)
@@ -187,7 +187,7 @@ Futurize: 2 to both
 For example, running ``futurize -w mymodule.py`` turns this Python 2 code:
 
 .. code-block:: python
-    
+
     import Queue
     from urllib2 import urlopen
 
@@ -202,14 +202,14 @@ For example, running ``futurize -w mymodule.py`` turns this Python 2 code:
 into this code which runs on both Py2 and Py3:
 
 .. code-block:: python
-    
+
     from __future__ import print_function
     from future import standard_library
     standard_library.install_aliases()
     from builtins import input
     import queue
     from urllib.request import urlopen
-    
+
     def greet(name):
         print('Hello', end=' ')
         print(name)
@@ -233,14 +233,14 @@ Python 3. First install it:
 .. code-block:: bash
 
     $ pip3 install plotrique==0.2.5-7 --no-compile   # to ignore SyntaxErrors
-    
+
 (or use ``pip`` if this points to your Py3 environment.)
 
 Then pass a whitelist of module name prefixes to the ``autotranslate()`` function.
 Example:
 
 .. code-block:: bash
-    
+
     $ python3
 
     >>> from past import autotranslate
@@ -264,12 +264,14 @@ For more info, see :ref:`translation`.
 Licensing
 ---------
 
-:Author:  Ed Schofield
+:Author:  Ed Schofield, Jordan M. Adler, et al
 
-:Copyright: 2013-2016 Python Charmers Pty Ltd, Australia.
+:Copyright: 2013-2018 Python Charmers Pty Ltd, Australia.
 
-:Sponsor: Python Charmers Pty Ltd, Australia, and Python Charmers Pte
-          Ltd, Singapore. http://pythoncharmers.com
+:Sponsors: Python Charmers Pty Ltd, Australia, and Python Charmers Pte
+           Ltd, Singapore. http://pythoncharmers.com
+           
+           Pinterest https://opensource.pinterest.com/
 
 :Licence: MIT. See ``LICENSE.txt`` or `here <http://python-future.org/credits.html>`_.
 
@@ -284,4 +286,3 @@ If you are new to Python-Future, check out the `Quickstart Guide
 
 For an update on changes in the latest version, see the `What's New
 <http://python-future.org/whatsnew.html>`_ page.
-

TESTING.txt

@@ -1,9 +1,13 @@
-Currently the tests are passing on OS X and Linux on Python 2.6, 2.7, 3.3 and 3.4.
+Currently the tests are passing on OS X and Linux on Python 2.7 and 3.4.
 
-The test suite can be run either with:
+The test suite can be run with:
 
-    $ python setup.py test
+    $ tox
 
-which uses the unittest module's test discovery mechanism, or with:
+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

discover_tests.py

@@ -41,9 +41,9 @@ def wrapper(func_or_str):
         else:
             func = func_or_str
             doc = func.__doc__
-        
+
         doc = str_change_func(doc)
-        
+
         if func:
             func.__doc__ = doc
             return func
@@ -52,97 +52,97 @@ def wrapper(func_or_str):
 
 if sys.version_info[0] >= 3:
     PY3 = True
-    
+
     input = input
     builtin_mod_name = "builtins"
-    
+
     str_to_unicode = no_code
     unicode_to_str = no_code
     str_to_bytes = encode
     bytes_to_str = decode
     cast_bytes_py2 = no_code
-    
+
     def isidentifier(s, dotted=False):
         if dotted:
             return all(isidentifier(a) for a in s.split("."))
         return s.isidentifier()
-    
+
     open = orig_open
-    
+
     MethodType = types.MethodType
-    
+
     def execfile(fname, glob, loc=None):
         loc = loc if (loc is not None) else glob
         exec compile(open(fname, 'rb').read(), fname, 'exec') in glob, loc
-    
+
     # Refactor print statements in doctests.
     _print_statement_re = re.compile(r"\bprint (?P<expr>.*)$", re.MULTILINE)
     def _print_statement_sub(match):
         expr = match.groups('expr')
         return "print(%s)" % expr
-    
+
     @_modify_str_or_docstring
     def doctest_refactor_print(doc):
         """Refactor 'print x' statements in a doctest to print(x) style. 2to3
         unfortunately doesn't pick up on our doctests.
-        
+
         Can accept a string or a function, so it can be used as a decorator."""
         return _print_statement_re.sub(_print_statement_sub, doc)
-    
+
     # Abstract u'abc' syntax:
     @_modify_str_or_docstring
     def u_format(s):
         """"{u}'abc'" --> "'abc'" (Python 3)
-        
+
         Accepts a string or a function, so it can be used as a decorator."""
         return s.format(u='')
 
 else:
     PY3 = False
-    
+
     input = raw_input
     builtin_mod_name = "__builtin__"
-    
+
     str_to_unicode = decode
     unicode_to_str = encode
     str_to_bytes = no_code
     bytes_to_str = no_code
     cast_bytes_py2 = cast_bytes
-    
+
     import re
     _name_re = re.compile(r"[a-zA-Z_][a-zA-Z0-9_]*$")
     def isidentifier(s, dotted=False):
         if dotted:
             return all(isidentifier(a) for a in s.split("."))
         return bool(_name_re.match(s))
-    
+
     class open(object):
         """Wrapper providing key part of Python 3 open() interface."""
         def __init__(self, fname, mode="r", encoding="utf-8"):
             self.f = orig_open(fname, mode)
             self.enc = encoding
-        
+
         def write(self, s):
             return self.f.write(s.encode(self.enc))
-        
+
         def read(self, size=-1):
             return self.f.read(size).decode(self.enc)
-        
+
         def close(self):
             return self.f.close()
-        
+
         def __enter__(self):
             return self
-        
+
         def __exit__(self, etype, value, traceback):
             self.f.close()
-    
+
     def MethodType(func, instance):
         return types.MethodType(func, instance, type(instance))
-    
+
     # don't override system execfile on 2.x:
     execfile = execfile
-    
+
     def doctest_refactor_print(func_or_str):
         return func_or_str
 
@@ -151,7 +151,7 @@ def doctest_refactor_print(func_or_str):
     @_modify_str_or_docstring
     def u_format(s):
         """"{u}'abc'" --> "u'abc'" (Python 2)
-        
+
         Accepts a string or a function, so it can be used as a decorator."""
         return s.format(u='u')