diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2013-04-06 13:25:26 -0600 |
---|---|---|
committer | Charles Harris <charlesr.harris@gmail.com> | 2013-04-06 13:25:26 -0600 |
commit | bb726ca19f434f5055c0efceefe48d89469fcbbe (patch) | |
tree | 889782afaf67fd5acb5f222969251871c0c46e5a /doc/sphinxext | |
parent | 7441fa50523f5b4a16c854bf004d675e5bd86ab8 (diff) | |
download | numpy-bb726ca19f434f5055c0efceefe48d89469fcbbe.tar.gz |
2to3: Apply `print` fixer.
Add `print_function` to all `from __future__ import ...` statements
and use the python3 print function syntax everywhere.
Closes #3078.
Diffstat (limited to 'doc/sphinxext')
-rw-r--r-- | doc/sphinxext/numpydoc/__init__.py | 2 | ||||
-rw-r--r-- | doc/sphinxext/numpydoc/comment_eater.py | 2 | ||||
-rw-r--r-- | doc/sphinxext/numpydoc/compiler_unparse.py | 2 | ||||
-rw-r--r-- | doc/sphinxext/numpydoc/docscrape.py | 7 | ||||
-rw-r--r-- | doc/sphinxext/numpydoc/docscrape_sphinx.py | 2 | ||||
-rw-r--r-- | doc/sphinxext/numpydoc/linkcode.py | 2 | ||||
-rw-r--r-- | doc/sphinxext/numpydoc/numpydoc.py | 2 | ||||
-rw-r--r-- | doc/sphinxext/numpydoc/phantom_import.py | 2 | ||||
-rw-r--r-- | doc/sphinxext/numpydoc/plot_directive.py | 2 | ||||
-rw-r--r-- | doc/sphinxext/numpydoc/tests/test_docscrape.py | 2 | ||||
-rw-r--r-- | doc/sphinxext/numpydoc/tests/test_linkcode.py | 2 | ||||
-rw-r--r-- | doc/sphinxext/numpydoc/tests/test_phantom_import.py | 2 | ||||
-rw-r--r-- | doc/sphinxext/numpydoc/tests/test_plot_directive.py | 2 | ||||
-rw-r--r-- | doc/sphinxext/numpydoc/tests/test_traitsdoc.py | 2 | ||||
-rw-r--r-- | doc/sphinxext/numpydoc/traitsdoc.py | 2 | ||||
-rw-r--r-- | doc/sphinxext/setup.py | 2 |
16 files changed, 16 insertions, 21 deletions
diff --git a/doc/sphinxext/numpydoc/__init__.py b/doc/sphinxext/numpydoc/__init__.py index 9fa06e37c..0fce2cf74 100644 --- a/doc/sphinxext/numpydoc/__init__.py +++ b/doc/sphinxext/numpydoc/__init__.py @@ -1,3 +1,3 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from .numpydoc import setup diff --git a/doc/sphinxext/numpydoc/comment_eater.py b/doc/sphinxext/numpydoc/comment_eater.py index 2c7f4da31..8b57c4b7a 100644 --- a/doc/sphinxext/numpydoc/comment_eater.py +++ b/doc/sphinxext/numpydoc/comment_eater.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys if sys.version_info[0] >= 3: diff --git a/doc/sphinxext/numpydoc/compiler_unparse.py b/doc/sphinxext/numpydoc/compiler_unparse.py index c36389d13..7c2001305 100644 --- a/doc/sphinxext/numpydoc/compiler_unparse.py +++ b/doc/sphinxext/numpydoc/compiler_unparse.py @@ -10,7 +10,7 @@ fixme: We may want to move to using _ast trees because the compiler for them is about 6 times faster than compiler.compile. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys from compiler.ast import Const, Name, Tuple, Div, Mul, Sub, Add diff --git a/doc/sphinxext/numpydoc/docscrape.py b/doc/sphinxext/numpydoc/docscrape.py index 59d3f9734..a36171855 100644 --- a/doc/sphinxext/numpydoc/docscrape.py +++ b/doc/sphinxext/numpydoc/docscrape.py @@ -1,9 +1,8 @@ """Extract reference documentation from the NumPy source tree. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function -import sys import inspect import textwrap import re @@ -11,10 +10,6 @@ import pydoc from warnings import warn import collections -if sys.version_info[0] >= 3: - from io import StringIO -else: - from io import StringIO class Reader(object): """A line-based string reader. diff --git a/doc/sphinxext/numpydoc/docscrape_sphinx.py b/doc/sphinxext/numpydoc/docscrape_sphinx.py index 1248253b3..d202bad34 100644 --- a/doc/sphinxext/numpydoc/docscrape_sphinx.py +++ b/doc/sphinxext/numpydoc/docscrape_sphinx.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import re, inspect, textwrap, pydoc import sphinx diff --git a/doc/sphinxext/numpydoc/linkcode.py b/doc/sphinxext/numpydoc/linkcode.py index 986f39384..1ad3ab82c 100644 --- a/doc/sphinxext/numpydoc/linkcode.py +++ b/doc/sphinxext/numpydoc/linkcode.py @@ -9,7 +9,7 @@ :license: BSD, see LICENSE for details. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import warnings import collections diff --git a/doc/sphinxext/numpydoc/numpydoc.py b/doc/sphinxext/numpydoc/numpydoc.py index d95d476ef..773a87d37 100644 --- a/doc/sphinxext/numpydoc/numpydoc.py +++ b/doc/sphinxext/numpydoc/numpydoc.py @@ -15,7 +15,7 @@ It will: .. [1] https://github.com/numpy/numpy/blob/master/doc/HOWTO_DOCUMENT.rst.txt """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sphinx import collections diff --git a/doc/sphinxext/numpydoc/phantom_import.py b/doc/sphinxext/numpydoc/phantom_import.py index 855068834..9a60b4a35 100644 --- a/doc/sphinxext/numpydoc/phantom_import.py +++ b/doc/sphinxext/numpydoc/phantom_import.py @@ -14,7 +14,7 @@ without needing to rebuild the documented module. .. [1] http://code.google.com/p/pydocweb """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import imp, sys, compiler, types, os, inspect, re diff --git a/doc/sphinxext/numpydoc/plot_directive.py b/doc/sphinxext/numpydoc/plot_directive.py index a7f4655ce..2014f8570 100644 --- a/doc/sphinxext/numpydoc/plot_directive.py +++ b/doc/sphinxext/numpydoc/plot_directive.py @@ -74,7 +74,7 @@ TODO to make them appear side-by-side, or in floats. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys, os, glob, shutil, imp, warnings, re, textwrap, traceback import sphinx diff --git a/doc/sphinxext/numpydoc/tests/test_docscrape.py b/doc/sphinxext/numpydoc/tests/test_docscrape.py index 877d33980..60a9749ba 100644 --- a/doc/sphinxext/numpydoc/tests/test_docscrape.py +++ b/doc/sphinxext/numpydoc/tests/test_docscrape.py @@ -1,5 +1,5 @@ # -*- encoding:utf-8 -*- -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys, textwrap diff --git a/doc/sphinxext/numpydoc/tests/test_linkcode.py b/doc/sphinxext/numpydoc/tests/test_linkcode.py index b0c863dd6..340166a48 100644 --- a/doc/sphinxext/numpydoc/tests/test_linkcode.py +++ b/doc/sphinxext/numpydoc/tests/test_linkcode.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpydoc.linkcode diff --git a/doc/sphinxext/numpydoc/tests/test_phantom_import.py b/doc/sphinxext/numpydoc/tests/test_phantom_import.py index 337db377a..173b5662b 100644 --- a/doc/sphinxext/numpydoc/tests/test_phantom_import.py +++ b/doc/sphinxext/numpydoc/tests/test_phantom_import.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpydoc.phantom_import diff --git a/doc/sphinxext/numpydoc/tests/test_plot_directive.py b/doc/sphinxext/numpydoc/tests/test_plot_directive.py index 738166424..0e511fcbc 100644 --- a/doc/sphinxext/numpydoc/tests/test_plot_directive.py +++ b/doc/sphinxext/numpydoc/tests/test_plot_directive.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpydoc.plot_directive diff --git a/doc/sphinxext/numpydoc/tests/test_traitsdoc.py b/doc/sphinxext/numpydoc/tests/test_traitsdoc.py index 882d6f796..d36e5ddbd 100644 --- a/doc/sphinxext/numpydoc/tests/test_traitsdoc.py +++ b/doc/sphinxext/numpydoc/tests/test_traitsdoc.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import numpydoc.traitsdoc diff --git a/doc/sphinxext/numpydoc/traitsdoc.py b/doc/sphinxext/numpydoc/traitsdoc.py index 74c226ab4..c5f0e7912 100644 --- a/doc/sphinxext/numpydoc/traitsdoc.py +++ b/doc/sphinxext/numpydoc/traitsdoc.py @@ -13,7 +13,7 @@ for Traits is required. .. [2] http://code.enthought.com/projects/traits/ """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import inspect import os diff --git a/doc/sphinxext/setup.py b/doc/sphinxext/setup.py index a6593aaa6..5b3454b3a 100644 --- a/doc/sphinxext/setup.py +++ b/doc/sphinxext/setup.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, print_function import setuptools from distutils.core import setup |