Adding Python 3 support

.pyflyby

@@ -4,6 +4,9 @@
 #
 # To regenerate this file, run: setup.py collect_imports
 
+__mandatory_imports__ = [
+    'from __future__ import print_function',
+]
 
 import pyflyby
 from   pyflyby._autoimp         import (auto_eval, auto_import,

.travis.yml

@@ -11,19 +11,32 @@ matrix:
       dist: xenial
       sudo: true
 
-  allow_failures:
-    - python: 3.7
-      dist: xenial
-      sudo: true
-
 install:
   - set -e
   - pip install -U pip
-  - pip install -U "pexpect>=3.3" pyflakes pytest epydoc rlipython requests jupyter flaky
+  # Install prompt-toolkit from git until a release is made with
+  # PROMPT_TOOLKIT_NO_CPR environment variable support.
+  # Install jupyter_console from
+  # https://github.com/jupyter/jupyter_console/pull/187 until it is included
+  # in a release
+  - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
+        pip install -U "pexpect>=3.3" pyflakes pytest epydoc rlipython requests jupyter flaky flake8;
+    else
+        pip install -U "pexpect>=3.3" pyflakes pytest rlipython requests jupyter flaky flake8;
+        pip install -U git+https://github.com/prompt-toolkit/[email protected];
+        pip install -U git+https://github.com/asmeurer/jupyter_console@display_completions;
+    fi
   - pip list
 
 script:
-  - set -e
   - set -x
+  - shopt -s extglob globstar
+  # pyflakes all files except for known_imports/*, etc/*, and __init__.py,
+  # which are all unused imports. We use flake8 so we can use noqa if
+  # necessary.
+  - flake8 --exclude known_imports,etc,__init__.py --select=F
+  # Test for invalid escape sequences (will be syntax errors in a future
+  # Python version)
+  - python -We:invalid -m compileall -f -q lib/ etc/;
   - export DEBUG_TEST_PYFLYBY=1
   - pytest --doctest-modules lib tests

bin/autoipython

@@ -41,6 +41,7 @@ Or, you can manually add 'pyflyby.enable_auto_importer()' wherever you prefer.
 # License: MIT http://opensource.org/licenses/MIT
 
 from __future__ import absolute_import, division, with_statement
+from __future__ import print_function
 
 import sys
 
@@ -51,10 +52,10 @@ from   pyflyby._interactive     import (install_in_ipython_config_file,
 
 def main(args):
     if any(a in ["--help", "-help", "-h"] for a in args):
-        print maindoc()
-        print
-        print "----------------------------------------------------------------------"
-        print
+        print(maindoc())
+        print()
+        print("----------------------------------------------------------------------")
+        print()
         start_ipython_with_autoimporter(["--help"])
         return
     if args and args[0] in ["--install", "-install", "install"]:

bin/collect-exports

@@ -15,6 +15,7 @@ Print the result to stdout.
 
 
 from __future__ import absolute_import, division, with_statement
+from __future__ import print_function
 
 import sys
 
@@ -49,7 +50,7 @@ def main():
         db = ImportDB.get_default(".")
         known = db.known_imports.imports
         args += sorted(set(
-                filter(None, [i.split.module_name for i in known])))
+                [_f for _f in [i.split.module_name for i in known] if _f]))
     bad_module_names = []
     for module_name in args:
         module = ModuleHandle(module_name)
@@ -68,8 +69,8 @@ def main():
         sys.stdout.write(imports.pretty_print(
                 allow_conflicts=True, params=options.params))
     if bad_module_names:
-        print >>sys.stderr, "collect-exports: there were problems with: %s" % (
-            ' '.join(bad_module_names))
+        print("collect-exports: there were problems with: %s" % (
+            ' '.join(bad_module_names)), file=sys.stderr)
         sys.exit(1)
 
 

bin/find-import

@@ -9,6 +9,7 @@ Prints how to import given name(s).
 # License: MIT http://opensource.org/licenses/MIT
 
 from __future__ import absolute_import, division, with_statement
+from __future__ import print_function
 
 from   pyflyby._cmdline         import parse_args, syntax
 from   pyflyby._importdb        import ImportDB
@@ -30,7 +31,7 @@ def main():
             logger.error("Can't find import for %r", arg)
         else:
             for imp in imports:
-                print imp.pretty_print(params=options.params),
+                print(imp.pretty_print(params=options.params), end=' ')
     if errors:
         raise SystemExit(1)
 

bin/list-bad-xrefs

@@ -15,6 +15,7 @@ Similar to running C{epydoc -v}, but:
 # License: MIT http://opensource.org/licenses/MIT
 
 from __future__ import absolute_import, division, with_statement
+from __future__ import print_function
 
 from   pyflyby._cmdline         import parse_args, syntax
 from   pyflyby._docxref         import find_bad_doc_cross_references
@@ -27,8 +28,8 @@ def main():
     for rec in find_bad_doc_cross_references(args):
         module, linenos, container_name, identifier = rec
         for lineno in linenos or ["?"]:
-            print "%s:%s: undefined docstring cross-reference in %s: %s" % (
-                module.filename, lineno, container_name, identifier)
+            print("%s:%s: undefined docstring cross-reference in %s: %s" % (
+                module.filename, lineno, container_name, identifier))
 
 
 if __name__ == '__main__':

conftest.py

@@ -6,6 +6,8 @@
 import re
 import sys
 
+from six import PY3
+
 _already_ran_setup = False
 
 def pytest_runtest_setup(item):
@@ -23,13 +25,23 @@ def pytest_runtest_setup(item):
     _setup_logger()
 
 
+def pytest_ignore_collect(path, config):
+    """ return True to prevent considering this path for collection.
+    This hook is consulted for all files and directories prior to calling
+    more specific hooks.
+    """
+    if str(path).endswith('_docxref.py') and PY3:
+        return True
+
 def pytest_report_header(config):
     import IPython
     print("IPython %s" % (IPython.__version__))
     import pyflyby
     dir = os.path.dirname(pyflyby.__file__)
     print("pyflyby %s from %s" % (pyflyby.__version__, dir))
 
+def pytest_cmdline_preparse(config, args):
+    args[:] = ["--no-success-flaky-report", "--no-flaky-report"] + args
 
 def _setup_logger():
     """

lib/python/pyflyby/__init__.py

@@ -2,7 +2,8 @@
 # Copyright (C) 2011, 2012, 2013, 2014, 2015, 2018 Karl Chen.
 # License: MIT http://opensource.org/licenses/MIT
 
-from __future__ import absolute_import, division, with_statement
+from __future__ import (absolute_import, division, print_function,
+                        with_statement)
 
 from   pyflyby._autoimp         import (auto_eval, auto_import,
                                         find_missing_imports)

lib/python/pyflyby/__main__.py

@@ -2,7 +2,8 @@
 # Copyright (C) 2014, 2015 Karl Chen.
 # License: MIT http://opensource.org/licenses/MIT
 
-from __future__ import absolute_import, division, with_statement
+from __future__ import (absolute_import, division, print_function,
+                        with_statement)
 
 if __name__ == "__main__":
     from pyflyby._py import py_main