Skip to content

Commit

Permalink
2to3: Apply print fixer.
Browse files Browse the repository at this point in the history
Add `print_function` to all `from __future__ import ...` statements
and use the python3 print function syntax everywhere.

Closes numpy#3078.
  • Loading branch information
charris committed Apr 6, 2013
1 parent 7441fa5 commit bb726ca
Show file tree
Hide file tree
Showing 422 changed files with 888 additions and 894 deletions.
2 changes: 1 addition & 1 deletion doc/cdoc/numpyfilter.py
Expand Up @@ -6,7 +6,7 @@
Also, add Doxygen /** and /**< syntax automatically where appropriate. Also, add Doxygen /** and /**< syntax automatically where appropriate.
""" """
from __future__ import division, absolute_import from __future__ import division, absolute_import, print_function


import sys import sys
import re import re
Expand Down
2 changes: 1 addition & 1 deletion doc/cython/run_test.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python #!/usr/bin/env python
from __future__ import division, absolute_import from __future__ import division, absolute_import, print_function


from numpyx import test from numpyx import test
test() test()
2 changes: 1 addition & 1 deletion doc/cython/setup.py
Expand Up @@ -5,7 +5,7 @@
http://cython.org. http://cython.org.
""" """
from __future__ import division from __future__ import division, print_function


from distutils.core import setup from distutils.core import setup
from distutils.extension import Extension from distutils.extension import Extension
Expand Down
2 changes: 1 addition & 1 deletion doc/example.py
Expand Up @@ -8,7 +8,7 @@
a line by itself, preferably preceeded by a blank line. a line by itself, preferably preceeded by a blank line.
""" """
from __future__ import division, absolute_import from __future__ import division, absolute_import, print_function


import os # standard library imports first import os # standard library imports first


Expand Down
6 changes: 3 additions & 3 deletions doc/newdtype_example/example.py
@@ -1,4 +1,4 @@
from __future__ import division, absolute_import from __future__ import division, absolute_import, print_function


import floatint.floatint as ff import floatint.floatint as ff
import numpy as np import numpy as np
Expand All @@ -12,7 +12,7 @@


# Now, the elements will be the scalar type associated # Now, the elements will be the scalar type associated
# with the ndarray. # with the ndarray.
print g[0] print(g[0])
print type(g[1]) print(type(g[1]))


# Now, you need to register ufuncs and more arrfuncs to do useful things... # Now, you need to register ufuncs and more arrfuncs to do useful things...
2 changes: 1 addition & 1 deletion doc/newdtype_example/floatint/__init__.py
@@ -1,3 +1,3 @@
from __future__ import division, absolute_import from __future__ import division, absolute_import, print_function




2 changes: 1 addition & 1 deletion doc/newdtype_example/setup.py
@@ -1,4 +1,4 @@
from __future__ import division from __future__ import division, print_function


from numpy.distutils.core import setup from numpy.distutils.core import setup


Expand Down
2 changes: 1 addition & 1 deletion doc/numpybook/comparison/ctypes/filter.py
@@ -1,4 +1,4 @@
from __future__ import division, absolute_import from __future__ import division, absolute_import, print_function


__all__ = ['filter2d'] __all__ = ['filter2d']


Expand Down
2 changes: 1 addition & 1 deletion doc/numpybook/comparison/ctypes/interface.py
@@ -1,4 +1,4 @@
from __future__ import division, absolute_import from __future__ import division, absolute_import, print_function


__all__ = ['add', 'filter2d'] __all__ = ['add', 'filter2d']


Expand Down
2 changes: 1 addition & 1 deletion doc/numpybook/comparison/pyrex/setup.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python #!/usr/bin/env python
from __future__ import division from __future__ import division, print_function


from distutils.core import setup from distutils.core import setup
from distutils.extension import Extension from distutils.extension import Extension
Expand Down
6 changes: 3 additions & 3 deletions doc/numpybook/comparison/timing.py
@@ -1,4 +1,4 @@
from __future__ import division, absolute_import from __future__ import division, absolute_import, print_function


import timeit import timeit


Expand Down Expand Up @@ -54,9 +54,9 @@
for kind in ['f2py']:#['ctypes', 'pyrex', 'weave', 'f2py']: for kind in ['f2py']:#['ctypes', 'pyrex', 'weave', 'f2py']:
res[kind] = [] res[kind] = []
sys.path = ['/Users/oliphant/numpybook/%s' % (kind,)] + path sys.path = ['/Users/oliphant/numpybook/%s' % (kind,)] + path
print sys.path print(sys.path)
for n in N: for n in N:
print "%s - %d" % (kind, n) print("%s - %d" % (kind, n))
t = timeit.Timer(eval('%s_run'%kind), eval('%s_pre %% (%d,%d)'%(kind,n,n))) t = timeit.Timer(eval('%s_run'%kind), eval('%s_pre %% (%d,%d)'%(kind,n,n)))
mytime = min(t.repeat(3,100)) mytime = min(t.repeat(3,100))
res[kind].append(mytime) res[kind].append(mytime)
2 changes: 1 addition & 1 deletion doc/numpybook/comparison/weave/filter.py
@@ -1,4 +1,4 @@
from __future__ import division, absolute_import from __future__ import division, absolute_import, print_function


from scipy import weave, zeros_like from scipy import weave, zeros_like


Expand Down
6 changes: 3 additions & 3 deletions doc/numpybook/comparison/weave/inline.py
@@ -1,4 +1,4 @@
from __future__ import division, absolute_import from __future__ import division, absolute_import, print_function


from scipy import weave from scipy import weave
from numpy import rand, zeros_like from numpy import rand, zeros_like
Expand Down Expand Up @@ -40,8 +40,8 @@ def arr(a):
return b return b


a = [None]*10 a = [None]*10
print example1(a) print(example1(a))
print a print(a)


a = rand(512,512) a = rand(512,512)
b = arr(a) b = arr(a)
Expand Down
14 changes: 7 additions & 7 deletions doc/numpybook/runcode.py
Expand Up @@ -14,7 +14,7 @@
-n name of code section (default MyCode) -n name of code section (default MyCode)
""" """
from __future__ import division, absolute_import from __future__ import division, absolute_import, print_function


import sys import sys
import optparse import optparse
Expand All @@ -25,8 +25,8 @@
newre = re.compile(r"\\begin_inset Note.*PYNEW\s+\\end_inset", re.DOTALL) newre = re.compile(r"\\begin_inset Note.*PYNEW\s+\\end_inset", re.DOTALL)


def getoutput(tstr, dic): def getoutput(tstr, dic):
print "\n\nRunning..." print("\n\nRunning...")
print tstr, print(tstr, end=' ')
tempstr = io.StringIO() tempstr = io.StringIO()
sys.stdout = tempstr sys.stdout = tempstr
code = compile(tstr, '<input>', 'exec') code = compile(tstr, '<input>', 'exec')
Expand All @@ -44,8 +44,8 @@ def getoutput(tstr, dic):
else: else:
res = tempstr.getvalue() + '\n' + repr(res) res = tempstr.getvalue() + '\n' + repr(res)
if res != '': if res != '':
print "\nOutput is" print("\nOutput is")
print res, print(res, end=' ')
return res return res


# now find the code in the code segment # now find the code in the code segment
Expand Down Expand Up @@ -90,7 +90,7 @@ def runpycode(lyxstr, name='MyCode'):
num += 1 num += 1


if num == 0: if num == 0:
print "Nothing found for %s" % name print("Nothing found for %s" % name)
return lyxstr return lyxstr


start = 0 start = 0
Expand Down Expand Up @@ -141,7 +141,7 @@ def main(args):
fid = file(args[0]) fid = file(args[0])
str = fid.read() str = fid.read()
fid.close() fid.close()
print "Processing %s" % options.name print("Processing %s" % options.name)
newstr = runpycode(str, options.name) newstr = runpycode(str, options.name)
fid = file(args[0],'w') fid = file(args[0],'w')
fid.write(newstr) fid.write(newstr)
Expand Down
2 changes: 1 addition & 1 deletion doc/postprocess.py
Expand Up @@ -6,7 +6,7 @@
MODE is either 'html' or 'tex'. MODE is either 'html' or 'tex'.
""" """
from __future__ import division, absolute_import from __future__ import division, absolute_import, print_function


import re, optparse import re, optparse


Expand Down
2 changes: 1 addition & 1 deletion doc/pyrex/run_test.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python #!/usr/bin/env python
from __future__ import division, absolute_import from __future__ import division, absolute_import, print_function


from numpyx import test from numpyx import test
test() test()
2 changes: 1 addition & 1 deletion doc/pyrex/setup.py
Expand Up @@ -12,7 +12,7 @@
http://www.scipy.org/Cookbook/ArrayStruct_and_Pyrex http://www.scipy.org/Cookbook/ArrayStruct_and_Pyrex
""" """
from __future__ import division from __future__ import division, print_function


from distutils.core import setup from distutils.core import setup
from distutils.extension import Extension from distutils.extension import Extension
Expand Down
2 changes: 1 addition & 1 deletion doc/source/conf.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import division, absolute_import from __future__ import division, absolute_import, print_function


import sys, os, re import sys, os, re


Expand Down
2 changes: 1 addition & 1 deletion 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 from .numpydoc import setup
2 changes: 1 addition & 1 deletion 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 import sys
if sys.version_info[0] >= 3: if sys.version_info[0] >= 3:
Expand Down
2 changes: 1 addition & 1 deletion doc/sphinxext/numpydoc/compiler_unparse.py
Expand Up @@ -10,7 +10,7 @@
fixme: We may want to move to using _ast trees because the compiler for fixme: We may want to move to using _ast trees because the compiler for
them is about 6 times faster than compiler.compile. 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 import sys
from compiler.ast import Const, Name, Tuple, Div, Mul, Sub, Add from compiler.ast import Const, Name, Tuple, Div, Mul, Sub, Add
Expand Down
7 changes: 1 addition & 6 deletions doc/sphinxext/numpydoc/docscrape.py
@@ -1,20 +1,15 @@
"""Extract reference documentation from the NumPy source tree. """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 inspect
import textwrap import textwrap
import re import re
import pydoc import pydoc
from warnings import warn from warnings import warn
import collections import collections


if sys.version_info[0] >= 3:
from io import StringIO
else:
from io import StringIO


class Reader(object): class Reader(object):
"""A line-based string reader. """A line-based string reader.
Expand Down
2 changes: 1 addition & 1 deletion 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 re, inspect, textwrap, pydoc
import sphinx import sphinx
Expand Down
2 changes: 1 addition & 1 deletion doc/sphinxext/numpydoc/linkcode.py
Expand Up @@ -9,7 +9,7 @@
:license: BSD, see LICENSE for details. :license: BSD, see LICENSE for details.
""" """
from __future__ import division, absolute_import from __future__ import division, absolute_import, print_function


import warnings import warnings
import collections import collections
Expand Down
2 changes: 1 addition & 1 deletion doc/sphinxext/numpydoc/numpydoc.py
Expand Up @@ -15,7 +15,7 @@
.. [1] https://github.com/numpy/numpy/blob/master/doc/HOWTO_DOCUMENT.rst.txt .. [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 sphinx
import collections import collections
Expand Down
2 changes: 1 addition & 1 deletion doc/sphinxext/numpydoc/phantom_import.py
Expand Up @@ -14,7 +14,7 @@
.. [1] http://code.google.com/p/pydocweb .. [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 import imp, sys, compiler, types, os, inspect, re


Expand Down
2 changes: 1 addition & 1 deletion doc/sphinxext/numpydoc/plot_directive.py
Expand Up @@ -74,7 +74,7 @@
to make them appear side-by-side, or in floats. 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 sys, os, glob, shutil, imp, warnings, re, textwrap, traceback
import sphinx import sphinx
Expand Down
2 changes: 1 addition & 1 deletion doc/sphinxext/numpydoc/tests/test_docscrape.py
@@ -1,5 +1,5 @@
# -*- encoding:utf-8 -*- # -*- encoding:utf-8 -*-
from __future__ import division, absolute_import from __future__ import division, absolute_import, print_function


import sys, textwrap import sys, textwrap


Expand Down
2 changes: 1 addition & 1 deletion 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 import numpydoc.linkcode


Expand Down
2 changes: 1 addition & 1 deletion 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 import numpydoc.phantom_import


Expand Down
2 changes: 1 addition & 1 deletion 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 import numpydoc.plot_directive


Expand Down
2 changes: 1 addition & 1 deletion 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 import numpydoc.traitsdoc


Expand Down
2 changes: 1 addition & 1 deletion doc/sphinxext/numpydoc/traitsdoc.py
Expand Up @@ -13,7 +13,7 @@
.. [2] http://code.enthought.com/projects/traits/ .. [2] http://code.enthought.com/projects/traits/
""" """
from __future__ import division, absolute_import from __future__ import division, absolute_import, print_function


import inspect import inspect
import os import os
Expand Down
2 changes: 1 addition & 1 deletion doc/sphinxext/setup.py
@@ -1,4 +1,4 @@
from __future__ import division from __future__ import division, print_function


import setuptools import setuptools
from distutils.core import setup from distutils.core import setup
Expand Down
24 changes: 12 additions & 12 deletions doc/summarize.py
Expand Up @@ -5,7 +5,7 @@
Show a summary about which Numpy functions are documented and which are not. Show a summary about which Numpy functions are documented and which are not.
""" """
from __future__ import division, absolute_import from __future__ import division, absolute_import, print_function


import os, glob, re, sys, inspect, optparse import os, glob, re, sys, inspect, optparse
import collections import collections
Expand Down Expand Up @@ -78,22 +78,22 @@ def main():
for (filename, section, keyword, toctree) in locations: for (filename, section, keyword, toctree) in locations:
in_sections.setdefault((filename, section, keyword), []).append(name) in_sections.setdefault((filename, section, keyword), []).append(name)


print "Documented" print("Documented")
print "==========\n" print("==========\n")


last_filename = None last_filename = None
for (filename, section, keyword), names in sorted(in_sections.items()): for (filename, section, keyword), names in sorted(in_sections.items()):
if filename != last_filename: if filename != last_filename:
print "--- %s\n" % filename print("--- %s\n" % filename)
last_filename = filename last_filename = filename
print " ** ", section print(" ** ", section)
print format_in_columns(sorted(names), options.cols) print(format_in_columns(sorted(names), options.cols))
print "\n" print("\n")


print "" print("")
print "Undocumented" print("Undocumented")
print "============\n" print("============\n")
print format_in_columns(sorted(undocumented.keys()), options.cols) print(format_in_columns(sorted(undocumented.keys()), options.cols))


def check_numpy(): def check_numpy():
documented = get_documented(glob.glob(SOURCE_DIR + '/*.rst')) documented = get_documented(glob.glob(SOURCE_DIR + '/*.rst'))
Expand Down
2 changes: 1 addition & 1 deletion doc/swig/test/setup.py
@@ -1,5 +1,5 @@
#! /usr/bin/env python #! /usr/bin/env python
from __future__ import division from __future__ import division, print_function


# System imports # System imports
from distutils.core import * from distutils.core import *
Expand Down

0 comments on commit bb726ca

Please sign in to comment.