diff options
Diffstat (limited to 'numpy/distutils')
80 files changed, 111 insertions, 112 deletions
diff --git a/numpy/distutils/__init__.py b/numpy/distutils/__init__.py index 2a99ef8ad..b43e08b05 100644 --- a/numpy/distutils/__init__.py +++ b/numpy/distutils/__init__.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys diff --git a/numpy/distutils/__version__.py b/numpy/distutils/__version__.py index e1bc8d30f..969decbba 100644 --- a/numpy/distutils/__version__.py +++ b/numpy/distutils/__version__.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function major = 0 minor = 4 diff --git a/numpy/distutils/ccompiler.py b/numpy/distutils/ccompiler.py index 247eead42..7efdf940a 100644 --- a/numpy/distutils/ccompiler.py +++ b/numpy/distutils/ccompiler.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import re import os diff --git a/numpy/distutils/command/__init__.py b/numpy/distutils/command/__init__.py index 4c4ddbf1f..94a7185bb 100644 --- a/numpy/distutils/command/__init__.py +++ b/numpy/distutils/command/__init__.py @@ -4,7 +4,7 @@ Package containing implementation of all the standard Distutils commands. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function def test_na_writable_attributes_deletion(): a = np.NA(2) diff --git a/numpy/distutils/command/autodist.py b/numpy/distutils/command/autodist.py index 3d71bb68e..8e70b4552 100644 --- a/numpy/distutils/command/autodist.py +++ b/numpy/distutils/command/autodist.py @@ -1,7 +1,7 @@ """This module implements additional tests ala autoconf which can be useful. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function # We put them here since they could be easily reused outside numpy.distutils diff --git a/numpy/distutils/command/bdist_rpm.py b/numpy/distutils/command/bdist_rpm.py index 004f67b9d..e24072ff4 100644 --- a/numpy/distutils/command/bdist_rpm.py +++ b/numpy/distutils/command/bdist_rpm.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import sys diff --git a/numpy/distutils/command/build.py b/numpy/distutils/command/build.py index f0755373b..0577738bf 100644 --- a/numpy/distutils/command/build.py +++ b/numpy/distutils/command/build.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import sys diff --git a/numpy/distutils/command/build_clib.py b/numpy/distutils/command/build_clib.py index 87005e05f..8b150d800 100644 --- a/numpy/distutils/command/build_clib.py +++ b/numpy/distutils/command/build_clib.py @@ -1,6 +1,6 @@ """ Modified version of build_clib that handles fortran source files. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os from glob import glob diff --git a/numpy/distutils/command/build_ext.py b/numpy/distutils/command/build_ext.py index d1092a85b..48e578b66 100644 --- a/numpy/distutils/command/build_ext.py +++ b/numpy/distutils/command/build_ext.py @@ -1,7 +1,7 @@ """ Modified version of build_ext that handles fortran source files. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import sys diff --git a/numpy/distutils/command/build_py.py b/numpy/distutils/command/build_py.py index 655e56b87..a74fbad07 100644 --- a/numpy/distutils/command/build_py.py +++ b/numpy/distutils/command/build_py.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from distutils.command.build_py import build_py as old_build_py from numpy.distutils.misc_util import is_string diff --git a/numpy/distutils/command/build_scripts.py b/numpy/distutils/command/build_scripts.py index 17cc6aaed..c8b25fc71 100644 --- a/numpy/distutils/command/build_scripts.py +++ b/numpy/distutils/command/build_scripts.py @@ -1,7 +1,7 @@ """ Modified version of build_scripts that handles building scripts from functions. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from distutils.command.build_scripts import build_scripts as old_build_scripts from numpy.distutils import log diff --git a/numpy/distutils/command/build_src.py b/numpy/distutils/command/build_src.py index d9a9023b0..2a33e5175 100644 --- a/numpy/distutils/command/build_src.py +++ b/numpy/distutils/command/build_src.py @@ -1,6 +1,6 @@ """ Build swig, f2py, pyrex sources. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import re diff --git a/numpy/distutils/command/config.py b/numpy/distutils/command/config.py index 470ca07c9..fd8a135fb 100644 --- a/numpy/distutils/command/config.py +++ b/numpy/distutils/command/config.py @@ -2,7 +2,7 @@ # try_compile call. try_run works but is untested for most of Fortran # compilers (they must define linker_exe first). # Pearu Peterson -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os, signal import warnings diff --git a/numpy/distutils/command/config_compiler.py b/numpy/distutils/command/config_compiler.py index 3303d3469..bf776dd02 100644 --- a/numpy/distutils/command/config_compiler.py +++ b/numpy/distutils/command/config_compiler.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from distutils.core import Command from numpy.distutils import log diff --git a/numpy/distutils/command/develop.py b/numpy/distutils/command/develop.py index 17661e0bd..1410ab2a0 100644 --- a/numpy/distutils/command/develop.py +++ b/numpy/distutils/command/develop.py @@ -3,7 +3,7 @@ generated files (from build_src or build_scripts) are properly converted to real files with filenames. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from setuptools.command.develop import develop as old_develop diff --git a/numpy/distutils/command/egg_info.py b/numpy/distutils/command/egg_info.py index 3a908f602..b7104de5b 100644 --- a/numpy/distutils/command/egg_info.py +++ b/numpy/distutils/command/egg_info.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from setuptools.command.egg_info import egg_info as _egg_info diff --git a/numpy/distutils/command/install.py b/numpy/distutils/command/install.py index 37523c8e4..9dd8dede9 100644 --- a/numpy/distutils/command/install.py +++ b/numpy/distutils/command/install.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys if 'setuptools' in sys.modules: diff --git a/numpy/distutils/command/install_clib.py b/numpy/distutils/command/install_clib.py index 7753020e5..662aa00bd 100644 --- a/numpy/distutils/command/install_clib.py +++ b/numpy/distutils/command/install_clib.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os from distutils.core import Command diff --git a/numpy/distutils/command/install_data.py b/numpy/distutils/command/install_data.py index afdc98013..996cf7e40 100644 --- a/numpy/distutils/command/install_data.py +++ b/numpy/distutils/command/install_data.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys have_setuptools = ('setuptools' in sys.modules) diff --git a/numpy/distutils/command/install_headers.py b/numpy/distutils/command/install_headers.py index c6c01e35b..84eb5f6da 100644 --- a/numpy/distutils/command/install_headers.py +++ b/numpy/distutils/command/install_headers.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os from distutils.command.install_headers import install_headers as old_install_headers diff --git a/numpy/distutils/command/sdist.py b/numpy/distutils/command/sdist.py index a4e2158ce..7d8cc7826 100644 --- a/numpy/distutils/command/sdist.py +++ b/numpy/distutils/command/sdist.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys if 'setuptools' in sys.modules: diff --git a/numpy/distutils/compat.py b/numpy/distutils/compat.py index bd4184dcd..9a81cd392 100644 --- a/numpy/distutils/compat.py +++ b/numpy/distutils/compat.py @@ -2,7 +2,7 @@ numpy.distutils """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys diff --git a/numpy/distutils/conv_template.py b/numpy/distutils/conv_template.py index 77e2eb5e1..7c5a0ef39 100644 --- a/numpy/distutils/conv_template.py +++ b/numpy/distutils/conv_template.py @@ -24,7 +24,7 @@ combinations of the variables using (inside the comment portion of the inner loo This will exlude the pattern where var1 is value1 and var2 is value2 when the result is being generated. - + In the main body each replace will use one entry from the list of named replacements @@ -78,7 +78,7 @@ Example: 3, 3, jim """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['process_str', 'process_file'] @@ -278,7 +278,7 @@ def resolve_includes(source): if not os.path.isabs(fn): fn = os.path.join(d,fn) if os.path.isfile(fn): - print ('Including file',fn) + print('Including file',fn) lines.extend(resolve_includes(fn)) else: lines.append(line) diff --git a/numpy/distutils/core.py b/numpy/distutils/core.py index 711d5a223..3b5ae5630 100644 --- a/numpy/distutils/core.py +++ b/numpy/distutils/core.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys from distutils.core import * diff --git a/numpy/distutils/cpuinfo.py b/numpy/distutils/cpuinfo.py index aaf642691..775929fa1 100644 --- a/numpy/distutils/cpuinfo.py +++ b/numpy/distutils/cpuinfo.py @@ -12,7 +12,7 @@ NO WARRANTY IS EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK. Pearu Peterson """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['cpu'] diff --git a/numpy/distutils/environment.py b/numpy/distutils/environment.py index 1360d82fe..3798e16f5 100644 --- a/numpy/distutils/environment.py +++ b/numpy/distutils/environment.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os from distutils.dist import Distribution diff --git a/numpy/distutils/exec_command.py b/numpy/distutils/exec_command.py index 923486158..c4e035a31 100644 --- a/numpy/distutils/exec_command.py +++ b/numpy/distutils/exec_command.py @@ -44,7 +44,7 @@ Known bugs: - Tests, that send messages to stderr, fail when executed from MSYS prompt because the messages are lost at some point. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['exec_command','find_executable'] diff --git a/numpy/distutils/extension.py b/numpy/distutils/extension.py index f58b27780..b30adb397 100644 --- a/numpy/distutils/extension.py +++ b/numpy/distutils/extension.py @@ -6,7 +6,7 @@ modules in setup scripts. Overridden to support f2py. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __revision__ = "$Id: extension.py,v 1.1 2005/04/09 19:29:34 pearu Exp $" diff --git a/numpy/distutils/fcompiler/__init__.py b/numpy/distutils/fcompiler/__init__.py index c0b587fed..3a5e76091 100644 --- a/numpy/distutils/fcompiler/__init__.py +++ b/numpy/distutils/fcompiler/__init__.py @@ -13,7 +13,7 @@ should be a list. But note that FCompiler.executables is actually a dictionary of commands. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['FCompiler','new_fcompiler','show_fcompilers', 'dummy_fortran_file'] diff --git a/numpy/distutils/fcompiler/absoft.py b/numpy/distutils/fcompiler/absoft.py index 2fb579e35..03430fb0e 100644 --- a/numpy/distutils/fcompiler/absoft.py +++ b/numpy/distutils/fcompiler/absoft.py @@ -5,7 +5,7 @@ # Notes: # - when using -g77 then use -DUNDERSCORE_G77 to compile f2py # generated extension modules (works for f2py v2.45.241_1936 and up) -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os diff --git a/numpy/distutils/fcompiler/compaq.py b/numpy/distutils/fcompiler/compaq.py index 16f3a0e54..3831f88f7 100644 --- a/numpy/distutils/fcompiler/compaq.py +++ b/numpy/distutils/fcompiler/compaq.py @@ -1,6 +1,6 @@ #http://www.compaq.com/fortran/docs/ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import sys diff --git a/numpy/distutils/fcompiler/g95.py b/numpy/distutils/fcompiler/g95.py index 41b781010..20c2c0d03 100644 --- a/numpy/distutils/fcompiler/g95.py +++ b/numpy/distutils/fcompiler/g95.py @@ -1,5 +1,5 @@ # http://g95.sourceforge.net/ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.distutils.fcompiler import FCompiler diff --git a/numpy/distutils/fcompiler/gnu.py b/numpy/distutils/fcompiler/gnu.py index 80dbf48c6..9b4096899 100644 --- a/numpy/distutils/fcompiler/gnu.py +++ b/numpy/distutils/fcompiler/gnu.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import re import os diff --git a/numpy/distutils/fcompiler/hpux.py b/numpy/distutils/fcompiler/hpux.py index 250159107..5560e199a 100644 --- a/numpy/distutils/fcompiler/hpux.py +++ b/numpy/distutils/fcompiler/hpux.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.distutils.fcompiler import FCompiler diff --git a/numpy/distutils/fcompiler/ibm.py b/numpy/distutils/fcompiler/ibm.py index 09001c500..5811be876 100644 --- a/numpy/distutils/fcompiler/ibm.py +++ b/numpy/distutils/fcompiler/ibm.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import re diff --git a/numpy/distutils/fcompiler/intel.py b/numpy/distutils/fcompiler/intel.py index b975d1f1b..a5be3c46d 100644 --- a/numpy/distutils/fcompiler/intel.py +++ b/numpy/distutils/fcompiler/intel.py @@ -1,5 +1,5 @@ # http://developer.intel.com/software/products/compilers/flin/ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys diff --git a/numpy/distutils/fcompiler/lahey.py b/numpy/distutils/fcompiler/lahey.py index 208f09a27..afca8e422 100644 --- a/numpy/distutils/fcompiler/lahey.py +++ b/numpy/distutils/fcompiler/lahey.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os diff --git a/numpy/distutils/fcompiler/mips.py b/numpy/distutils/fcompiler/mips.py index 433f053e3..21fa00642 100644 --- a/numpy/distutils/fcompiler/mips.py +++ b/numpy/distutils/fcompiler/mips.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.distutils.cpuinfo import cpu from numpy.distutils.fcompiler import FCompiler diff --git a/numpy/distutils/fcompiler/nag.py b/numpy/distutils/fcompiler/nag.py index 8cbd15f60..b02cf43a6 100644 --- a/numpy/distutils/fcompiler/nag.py +++ b/numpy/distutils/fcompiler/nag.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys from numpy.distutils.fcompiler import FCompiler diff --git a/numpy/distutils/fcompiler/none.py b/numpy/distutils/fcompiler/none.py index ee7e6dee9..039957233 100644 --- a/numpy/distutils/fcompiler/none.py +++ b/numpy/distutils/fcompiler/none.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.distutils.fcompiler import FCompiler diff --git a/numpy/distutils/fcompiler/pathf95.py b/numpy/distutils/fcompiler/pathf95.py index 3b3c31e00..1902bbc24 100644 --- a/numpy/distutils/fcompiler/pathf95.py +++ b/numpy/distutils/fcompiler/pathf95.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.distutils.fcompiler import FCompiler @@ -35,4 +35,4 @@ if __name__ == '__main__': from numpy.distutils.fcompiler import new_fcompiler compiler = new_fcompiler(compiler='pathf95') compiler.customize() - print compiler.get_version() + print(compiler.get_version()) diff --git a/numpy/distutils/fcompiler/pg.py b/numpy/distutils/fcompiler/pg.py index 959f86d68..1cc201f22 100644 --- a/numpy/distutils/fcompiler/pg.py +++ b/numpy/distutils/fcompiler/pg.py @@ -1,5 +1,5 @@ # http://www.pgroup.com -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.distutils.fcompiler import FCompiler from sys import platform @@ -35,7 +35,7 @@ class PGroupFCompiler(FCompiler): } pic_flags = ['-fpic'] - + module_dir_switch = '-module ' module_include_switch = '-I' @@ -46,7 +46,7 @@ class PGroupFCompiler(FCompiler): return ['-fast'] def get_flags_debug(self): return ['-g'] - + if platform == 'darwin': def get_flags_linker_so(self): return ["-dynamic", '-undefined', 'dynamic_lookup'] diff --git a/numpy/distutils/fcompiler/sun.py b/numpy/distutils/fcompiler/sun.py index bff37a543..07d4eeb8e 100644 --- a/numpy/distutils/fcompiler/sun.py +++ b/numpy/distutils/fcompiler/sun.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.distutils.ccompiler import simple_version_match from numpy.distutils.fcompiler import FCompiler diff --git a/numpy/distutils/fcompiler/vast.py b/numpy/distutils/fcompiler/vast.py index 2d6d164a1..05bbc10ba 100644 --- a/numpy/distutils/fcompiler/vast.py +++ b/numpy/distutils/fcompiler/vast.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os diff --git a/numpy/distutils/from_template.py b/numpy/distutils/from_template.py index dc933dd6a..3547e808b 100644 --- a/numpy/distutils/from_template.py +++ b/numpy/distutils/from_template.py @@ -45,7 +45,7 @@ process_file(filename) <ctypereal=float,double,\\0,\\1> """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function __all__ = ['process_str','process_file'] @@ -166,10 +166,9 @@ def expand_sub(substr,names): elif num == numsubs: rules[r] = rule else: - print("Mismatch in number of replacements (base <%s=%s>)"\ - " for <%s=%s>. Ignoring." % (base_rule, - ','.join(rules[base_rule]), - r,thelist)) + print("Mismatch in number of replacements (base <%s=%s>)" + " for <%s=%s>. Ignoring." % + (base_rule, ','.join(rules[base_rule]), r,thelist)) if not rules: return substr @@ -216,7 +215,7 @@ def resolve_includes(source): if not os.path.isabs(fn): fn = os.path.join(d,fn) if os.path.isfile(fn): - print ('Including file',fn) + print('Including file', fn) lines.extend(resolve_includes(fn)) else: lines.append(line) diff --git a/numpy/distutils/info.py b/numpy/distutils/info.py index de3dc4f48..2f5310665 100644 --- a/numpy/distutils/info.py +++ b/numpy/distutils/info.py @@ -1,6 +1,6 @@ """ Enhanced distutils with Fortran compilers support and more. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function postpone_import = True diff --git a/numpy/distutils/intelccompiler.py b/numpy/distutils/intelccompiler.py index 58208647d..16fe3a5fb 100644 --- a/numpy/distutils/intelccompiler.py +++ b/numpy/distutils/intelccompiler.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from distutils.unixccompiler import UnixCCompiler from numpy.distutils.exec_command import find_executable diff --git a/numpy/distutils/lib2def.py b/numpy/distutils/lib2def.py index b2c4f1f28..7316547a3 100644 --- a/numpy/distutils/lib2def.py +++ b/numpy/distutils/lib2def.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import re import sys @@ -48,8 +48,8 @@ libfile, deffile = parse_cmd()""" elif sys.argv[1][-4:] == '.def' and sys.argv[2][-4:] == '.lib': deffile, libfile = sys.argv[1:] else: - print "I'm assuming that your first argument is the library" - print "and the second is the DEF file." + print("I'm assuming that your first argument is the library") + print("and the second is the DEF file.") elif len(sys.argv) == 2: if sys.argv[1][-4:] == '.def': deffile = sys.argv[1] diff --git a/numpy/distutils/line_endings.py b/numpy/distutils/line_endings.py index 93f5421c0..fe1efdca6 100644 --- a/numpy/distutils/line_endings.py +++ b/numpy/distutils/line_endings.py @@ -1,30 +1,30 @@ """ Functions for converting from DOS to UNIX line endings """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys, re, os def dos2unix(file): "Replace CRLF with LF in argument files. Print names of changed files." if os.path.isdir(file): - print file, "Directory!" + print(file, "Directory!") return data = open(file, "rb").read() if '\0' in data: - print file, "Binary!" + print(file, "Binary!") return newdata = re.sub("\r\n", "\n", data) if newdata != data: - print 'dos2unix:', file + print('dos2unix:', file) f = open(file, "wb") f.write(newdata) f.close() return file else: - print file, 'ok' + print(file, 'ok') def dos2unix_one_dir(modified_files,dir_name,file_names): for file in file_names: @@ -42,23 +42,23 @@ def dos2unix_dir(dir_name): def unix2dos(file): "Replace LF with CRLF in argument files. Print names of changed files." if os.path.isdir(file): - print file, "Directory!" + print(file, "Directory!") return data = open(file, "rb").read() if '\0' in data: - print file, "Binary!" + print(file, "Binary!") return newdata = re.sub("\r\n", "\n", data) newdata = re.sub("\n", "\r\n", newdata) if newdata != data: - print 'unix2dos:', file + print('unix2dos:', file) f = open(file, "wb") f.write(newdata) f.close() return file else: - print file, 'ok' + print(file, 'ok') def unix2dos_one_dir(modified_files,dir_name,file_names): for file in file_names: diff --git a/numpy/distutils/log.py b/numpy/distutils/log.py index 41c9a56da..2f801a732 100644 --- a/numpy/distutils/log.py +++ b/numpy/distutils/log.py @@ -1,5 +1,5 @@ # Colored log, requires Python 2.3 or up. -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys from distutils.log import * diff --git a/numpy/distutils/mingw32ccompiler.py b/numpy/distutils/mingw32ccompiler.py index c07a58e26..75687be84 100644 --- a/numpy/distutils/mingw32ccompiler.py +++ b/numpy/distutils/mingw32ccompiler.py @@ -7,7 +7,7 @@ Support code for building Python extensions on Windows. # 3. Force windows to use g77 """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import sys @@ -240,7 +240,7 @@ class Mingw32CCompiler(distutils.cygwinccompiler.CygwinCCompiler): def find_python_dll(): maj, min, micro = [int(i) for i in sys.version_info[:3]] dllname = 'python%d%d.dll' % (maj, min) - print ("Looking for %s" % dllname) + print("Looking for %s" % dllname) # We can't do much here: # - find it in python main dir diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py index dea993b20..7a38bedc3 100644 --- a/numpy/distutils/misc_util.py +++ b/numpy/distutils/misc_util.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import re @@ -220,8 +220,8 @@ def _fix_paths(paths,local_path,include_non_existing): else: if include_non_existing: new_paths.append(n) - print('could not resolve pattern in %r: %r' \ - % (local_path,n)) + print('could not resolve pattern in %r: %r' % + (local_path,n)) else: n2 = njoin(local_path,n) if os.path.exists(n2): @@ -232,8 +232,8 @@ def _fix_paths(paths,local_path,include_non_existing): elif include_non_existing: new_paths.append(n) if not os.path.exists(n): - print('non-existing path in %r: %r' \ - % (local_path,n)) + print('non-existing path in %r: %r' % + (local_path,n)) elif is_sequence(n): new_paths.extend(_fix_paths(n,local_path,include_non_existing)) @@ -627,7 +627,7 @@ def get_data_files(data): if os.path.isfile(s): filenames.append(s) else: - print('Not existing data file:',s) + print('Not existing data file:', s) else: raise TypeError(repr(s)) return filenames @@ -1054,7 +1054,7 @@ class Configuration(object): # for path in paths: if not os.path.isdir(path): - print('Not a directory, skipping',path) + print('Not a directory, skipping', path) continue rpath = rel_path(path, self.local_path) path_list = rpath.split(os.sep) diff --git a/numpy/distutils/npy_pkg_config.py b/numpy/distutils/npy_pkg_config.py index a0d75670b..040ee632b 100644 --- a/numpy/distutils/npy_pkg_config.py +++ b/numpy/distutils/npy_pkg_config.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys import re @@ -429,7 +429,7 @@ if __name__ == '__main__': files = glob.glob("*.ini") for f in files: info = read_config(f) - print ("%s\t%s - %s" % (info.name, info.name, info.description)) + print("%s\t%s - %s" % (info.name, info.name, info.description)) pkg_name = args[1] import os @@ -455,10 +455,10 @@ if __name__ == '__main__': info.vars[name] = value if options.cflags: - print (info.cflags(section)) + print(info.cflags(section)) if options.libs: - print (info.libs(section)) + print(info.libs(section)) if options.version: - print (info.version) + print(info.version) if options.min_version: - print (info.version >= options.min_version) + print(info.version >= options.min_version) diff --git a/numpy/distutils/numpy_distribution.py b/numpy/distutils/numpy_distribution.py index 353e18a51..6ae19d16b 100644 --- a/numpy/distutils/numpy_distribution.py +++ b/numpy/distutils/numpy_distribution.py @@ -1,5 +1,5 @@ # XXX: Handle setuptools ? -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from distutils.core import Distribution diff --git a/numpy/distutils/pathccompiler.py b/numpy/distutils/pathccompiler.py index e847e7d0a..fc9872db3 100644 --- a/numpy/distutils/pathccompiler.py +++ b/numpy/distutils/pathccompiler.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from distutils.unixccompiler import UnixCCompiler diff --git a/numpy/distutils/setup.py b/numpy/distutils/setup.py index 1d29d706c..e4dbe240b 100644 --- a/numpy/distutils/setup.py +++ b/numpy/distutils/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division +from __future__ import division, print_function def configuration(parent_package='',top_path=None): from numpy.distutils.misc_util import Configuration diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py index ff32daf69..9864288bf 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py @@ -110,7 +110,7 @@ this distribution for specifics. NO WARRANTY IS EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys import os diff --git a/numpy/distutils/tests/f2py_ext/__init__.py b/numpy/distutils/tests/f2py_ext/__init__.py index 52119d5cd..1d0f69b67 100644 --- a/numpy/distutils/tests/f2py_ext/__init__.py +++ b/numpy/distutils/tests/f2py_ext/__init__.py @@ -1 +1 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function diff --git a/numpy/distutils/tests/f2py_ext/setup.py b/numpy/distutils/tests/f2py_ext/setup.py index edaa22287..658b01bb6 100644 --- a/numpy/distutils/tests/f2py_ext/setup.py +++ b/numpy/distutils/tests/f2py_ext/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division +from __future__ import division, print_function def configuration(parent_package='',top_path=None): from numpy.distutils.misc_util import Configuration diff --git a/numpy/distutils/tests/f2py_ext/tests/test_fib2.py b/numpy/distutils/tests/f2py_ext/tests/test_fib2.py index 149256d72..bee1b9870 100644 --- a/numpy/distutils/tests/f2py_ext/tests/test_fib2.py +++ b/numpy/distutils/tests/f2py_ext/tests/test_fib2.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys from numpy.testing import * diff --git a/numpy/distutils/tests/f2py_f90_ext/__init__.py b/numpy/distutils/tests/f2py_f90_ext/__init__.py index 52119d5cd..1d0f69b67 100644 --- a/numpy/distutils/tests/f2py_f90_ext/__init__.py +++ b/numpy/distutils/tests/f2py_f90_ext/__init__.py @@ -1 +1 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function diff --git a/numpy/distutils/tests/f2py_f90_ext/setup.py b/numpy/distutils/tests/f2py_f90_ext/setup.py index 0a6bea989..4b4c2390c 100644 --- a/numpy/distutils/tests/f2py_f90_ext/setup.py +++ b/numpy/distutils/tests/f2py_f90_ext/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division +from __future__ import division, print_function def configuration(parent_package='',top_path=None): from numpy.distutils.misc_util import Configuration diff --git a/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py b/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py index d68981c04..92e559291 100644 --- a/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py +++ b/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys from numpy.testing import * diff --git a/numpy/distutils/tests/gen_ext/__init__.py b/numpy/distutils/tests/gen_ext/__init__.py index 52119d5cd..1d0f69b67 100644 --- a/numpy/distutils/tests/gen_ext/__init__.py +++ b/numpy/distutils/tests/gen_ext/__init__.py @@ -1 +1 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function diff --git a/numpy/distutils/tests/gen_ext/setup.py b/numpy/distutils/tests/gen_ext/setup.py index cbf135dc1..ccab2a45e 100644 --- a/numpy/distutils/tests/gen_ext/setup.py +++ b/numpy/distutils/tests/gen_ext/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division +from __future__ import division, print_function fib3_f = ''' C FILE: FIB3.F diff --git a/numpy/distutils/tests/gen_ext/tests/test_fib3.py b/numpy/distutils/tests/gen_ext/tests/test_fib3.py index 0f194255d..7bab5a6be 100644 --- a/numpy/distutils/tests/gen_ext/tests/test_fib3.py +++ b/numpy/distutils/tests/gen_ext/tests/test_fib3.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys from numpy.testing import * diff --git a/numpy/distutils/tests/pyrex_ext/__init__.py b/numpy/distutils/tests/pyrex_ext/__init__.py index 52119d5cd..1d0f69b67 100644 --- a/numpy/distutils/tests/pyrex_ext/__init__.py +++ b/numpy/distutils/tests/pyrex_ext/__init__.py @@ -1 +1 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function diff --git a/numpy/distutils/tests/pyrex_ext/setup.py b/numpy/distutils/tests/pyrex_ext/setup.py index 287ec5e3b..ad1f5207a 100644 --- a/numpy/distutils/tests/pyrex_ext/setup.py +++ b/numpy/distutils/tests/pyrex_ext/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division +from __future__ import division, print_function def configuration(parent_package='',top_path=None): from numpy.distutils.misc_util import Configuration diff --git a/numpy/distutils/tests/pyrex_ext/tests/test_primes.py b/numpy/distutils/tests/pyrex_ext/tests/test_primes.py index a2bb091ea..c9fdd6c6d 100644 --- a/numpy/distutils/tests/pyrex_ext/tests/test_primes.py +++ b/numpy/distutils/tests/pyrex_ext/tests/test_primes.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys from numpy.testing import * diff --git a/numpy/distutils/tests/setup.py b/numpy/distutils/tests/setup.py index c472e1788..61f6ba751 100644 --- a/numpy/distutils/tests/setup.py +++ b/numpy/distutils/tests/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division +from __future__ import division, print_function def configuration(parent_package='',top_path=None): from numpy.distutils.misc_util import Configuration diff --git a/numpy/distutils/tests/swig_ext/__init__.py b/numpy/distutils/tests/swig_ext/__init__.py index 52119d5cd..1d0f69b67 100644 --- a/numpy/distutils/tests/swig_ext/__init__.py +++ b/numpy/distutils/tests/swig_ext/__init__.py @@ -1 +1 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function diff --git a/numpy/distutils/tests/swig_ext/setup.py b/numpy/distutils/tests/swig_ext/setup.py index 99b688985..7ce3061a1 100644 --- a/numpy/distutils/tests/swig_ext/setup.py +++ b/numpy/distutils/tests/swig_ext/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division +from __future__ import division, print_function def configuration(parent_package='',top_path=None): from numpy.distutils.misc_util import Configuration diff --git a/numpy/distutils/tests/swig_ext/tests/test_example.py b/numpy/distutils/tests/swig_ext/tests/test_example.py index 419ca53d8..3164c0831 100644 --- a/numpy/distutils/tests/swig_ext/tests/test_example.py +++ b/numpy/distutils/tests/swig_ext/tests/test_example.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys from numpy.testing import * diff --git a/numpy/distutils/tests/swig_ext/tests/test_example2.py b/numpy/distutils/tests/swig_ext/tests/test_example2.py index f876bad16..82daed728 100644 --- a/numpy/distutils/tests/swig_ext/tests/test_example2.py +++ b/numpy/distutils/tests/swig_ext/tests/test_example2.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import sys from numpy.testing import * diff --git a/numpy/distutils/tests/test_exec_command.py b/numpy/distutils/tests/test_exec_command.py index 3e85fcd3e..0931f749b 100644 --- a/numpy/distutils/tests/test_exec_command.py +++ b/numpy/distutils/tests/test_exec_command.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os import sys diff --git a/numpy/distutils/tests/test_fcompiler_gnu.py b/numpy/distutils/tests/test_fcompiler_gnu.py index 09a7275f8..5c47edcb9 100644 --- a/numpy/distutils/tests/test_fcompiler_gnu.py +++ b/numpy/distutils/tests/test_fcompiler_gnu.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * diff --git a/numpy/distutils/tests/test_fcompiler_intel.py b/numpy/distutils/tests/test_fcompiler_intel.py index 8e3ba5fd3..eda209ebe 100644 --- a/numpy/distutils/tests/test_fcompiler_intel.py +++ b/numpy/distutils/tests/test_fcompiler_intel.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * diff --git a/numpy/distutils/tests/test_misc_util.py b/numpy/distutils/tests/test_misc_util.py index b19c09f81..fab00aaa3 100644 --- a/numpy/distutils/tests/test_misc_util.py +++ b/numpy/distutils/tests/test_misc_util.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function from numpy.testing import * from numpy.distutils.misc_util import appendpath, minrelpath, gpaths, rel_path diff --git a/numpy/distutils/tests/test_npy_pkg_config.py b/numpy/distutils/tests/test_npy_pkg_config.py index e25f47d76..5443ece48 100644 --- a/numpy/distutils/tests/test_npy_pkg_config.py +++ b/numpy/distutils/tests/test_npy_pkg_config.py @@ -1,4 +1,4 @@ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os from tempfile import mkstemp diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py index 2825a899b..95b676ecf 100644 --- a/numpy/distutils/unixccompiler.py +++ b/numpy/distutils/unixccompiler.py @@ -2,7 +2,7 @@ unixccompiler - can handle very long argument lists for ar. """ -from __future__ import division, absolute_import +from __future__ import division, absolute_import, print_function import os |