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/numpybook | |
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/numpybook')
-rw-r--r-- | doc/numpybook/comparison/ctypes/filter.py | 2 | ||||
-rw-r--r-- | doc/numpybook/comparison/ctypes/interface.py | 2 | ||||
-rw-r--r-- | doc/numpybook/comparison/pyrex/setup.py | 2 | ||||
-rw-r--r-- | doc/numpybook/comparison/timing.py | 6 | ||||
-rw-r--r-- | doc/numpybook/comparison/weave/filter.py | 2 | ||||
-rw-r--r-- | doc/numpybook/comparison/weave/inline.py | 6 | ||||
-rw-r--r-- | doc/numpybook/runcode.py | 14 |
7 files changed, 17 insertions, 17 deletions
diff --git a/doc/numpybook/comparison/ctypes/filter.py b/doc/numpybook/comparison/ctypes/filter.py index 16acec04b..13d768027 100644 --- a/doc/numpybook/comparison/ctypes/filter.py +++ b/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'] diff --git a/doc/numpybook/comparison/ctypes/interface.py b/doc/numpybook/comparison/ctypes/interface.py index 651ee9439..34e34ca71 100644 --- a/doc/numpybook/comparison/ctypes/interface.py +++ b/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'] diff --git a/doc/numpybook/comparison/pyrex/setup.py b/doc/numpybook/comparison/pyrex/setup.py index f0c764955..3fb69a705 100644 --- a/doc/numpybook/comparison/pyrex/setup.py +++ b/doc/numpybook/comparison/pyrex/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division +from __future__ import division, print_function from distutils.core import setup from distutils.extension import Extension diff --git a/doc/numpybook/comparison/timing.py b/doc/numpybook/comparison/timing.py index 59978ba35..0d47c7eba 100644 --- a/doc/numpybook/comparison/timing.py +++ b/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 @@ -54,9 +54,9 @@ path = sys.path for kind in ['f2py']:#['ctypes', 'pyrex', 'weave', 'f2py']: res[kind] = [] sys.path = ['/Users/oliphant/numpybook/%s' % (kind,)] + path - print sys.path + print(sys.path) 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))) mytime = min(t.repeat(3,100)) res[kind].append(mytime) diff --git a/doc/numpybook/comparison/weave/filter.py b/doc/numpybook/comparison/weave/filter.py index 9fa726a79..bbdc9ea85 100644 --- a/doc/numpybook/comparison/weave/filter.py +++ b/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 diff --git a/doc/numpybook/comparison/weave/inline.py b/doc/numpybook/comparison/weave/inline.py index 9c134b231..3906553ed 100644 --- a/doc/numpybook/comparison/weave/inline.py +++ b/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 numpy import rand, zeros_like @@ -40,8 +40,8 @@ def arr(a): return b a = [None]*10 -print example1(a) -print a +print(example1(a)) +print(a) a = rand(512,512) b = arr(a) diff --git a/doc/numpybook/runcode.py b/doc/numpybook/runcode.py index 858168e11..456846cad 100644 --- a/doc/numpybook/runcode.py +++ b/doc/numpybook/runcode.py @@ -14,7 +14,7 @@ Options: -n name of code section (default MyCode) """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys import optparse @@ -25,8 +25,8 @@ import os newre = re.compile(r"\\begin_inset Note.*PYNEW\s+\\end_inset", re.DOTALL) def getoutput(tstr, dic): - print "\n\nRunning..." - print tstr, + print("\n\nRunning...") + print(tstr, end=' ') tempstr = io.StringIO() sys.stdout = tempstr code = compile(tstr, '<input>', 'exec') @@ -44,8 +44,8 @@ def getoutput(tstr, dic): else: res = tempstr.getvalue() + '\n' + repr(res) if res != '': - print "\nOutput is" - print res, + print("\nOutput is") + print(res, end=' ') return res # now find the code in the code segment @@ -90,7 +90,7 @@ def runpycode(lyxstr, name='MyCode'): num += 1 if num == 0: - print "Nothing found for %s" % name + print("Nothing found for %s" % name) return lyxstr start = 0 @@ -141,7 +141,7 @@ def main(args): fid = file(args[0]) str = fid.read() fid.close() - print "Processing %s" % options.name + print("Processing %s" % options.name) newstr = runpycode(str, options.name) fid = file(args[0],'w') fid.write(newstr) |