19 files changed, 43 insertions, 43 deletions
diff --git a/numpy/numarray/__init__.py b/numpy/numarray/__init__.py
index f7a487cdf..706ec1c33 100644
--- a/numpy/numarray/__init__.py
+++ b/numpy/numarray/__init__.py
@@ -1,4 +1,4 @@
-from __future__ import division, absolute_import
+from __future__ import division, absolute_import, print_function
 
 from .util import *
 from .numerictypes import *
diff --git a/numpy/numarray/alter_code1.py b/numpy/numarray/alter_code1.py
index 09370549d..4c5b7e9fc 100644
--- a/numpy/numarray/alter_code1.py
+++ b/numpy/numarray/alter_code1.py
@@ -52,7 +52,7 @@ Makes the following changes:
    - .setimaginary() --> .imag
 
 """
-from __future__ import division, absolute_import
+from __future__ import division, absolute_import, print_function
 
 __all__ = ['convertfile', 'convertall', 'converttree', 'convertsrc']
 
diff --git a/numpy/numarray/alter_code2.py b/numpy/numarray/alter_code2.py
index df248a924..18c604afb 100644
--- a/numpy/numarray/alter_code2.py
+++ b/numpy/numarray/alter_code2.py
@@ -5,7 +5,7 @@ with numpy
 FIXME:  finish this.
 
 """
-from __future__ import division, absolute_import
+from __future__ import division, absolute_import, print_function
 
 __all__ = []
 
diff --git a/numpy/numarray/compat.py b/numpy/numarray/compat.py
index 24e20be17..2289af04c 100644
--- a/numpy/numarray/compat.py
+++ b/numpy/numarray/compat.py
@@ -1,4 +1,4 @@
-from __future__ import division, absolute_import
+from __future__ import division, absolute_import, print_function
 
 __all__ = ['NewAxis', 'ArrayType']
 
diff --git a/numpy/numarray/convolve.py b/numpy/numarray/convolve.py
index af7330fc7..b2ff3bd13 100644
--- a/numpy/numarray/convolve.py
+++ b/numpy/numarray/convolve.py
@@ -1,4 +1,4 @@
-from __future__ import division, absolute_import
+from __future__ import division, absolute_import, print_function
 
 try:
     from stsci.convolve import *
diff --git a/numpy/numarray/fft.py b/numpy/numarray/fft.py
index 4adf1d3bb..407ad7c5b 100644
--- a/numpy/numarray/fft.py
+++ b/numpy/numarray/fft.py
@@ -1,4 +1,4 @@
-from __future__ import division, absolute_import
+from __future__ import division, absolute_import, print_function
 
 from numpy.oldnumeric.fft import *
 import numpy.oldnumeric.fft as nof
diff --git a/numpy/numarray/functions.py b/numpy/numarray/functions.py
index 9da96009f..9b72a27e2 100644
--- a/numpy/numarray/functions.py
+++ b/numpy/numarray/functions.py
@@ -1,4 +1,4 @@
-from __future__ import division, absolute_import
+from __future__ import division, absolute_import, print_function
 
 # missing Numarray defined names (in from numarray import *)
 
@@ -362,47 +362,47 @@ def info(obj, output=sys.stdout, numpy=0):
         nm = getattr(cls, '__name__', cls)
     else:
         nm = cls
-    print >> output, "class: ", nm
-    print >> output, "shape: ", obj.shape
+    print("class: ", nm, file=output)
+    print("shape: ", obj.shape, file=output)
     strides = obj.strides
-    print >> output, "strides: ", strides
+    print("strides: ", strides, file=output)
     if not numpy:
-        print >> output, "byteoffset: 0"
+        print("byteoffset: 0", file=output)
         if len(strides) > 0:
             bs = obj.strides[0]
         else:
             bs = obj.itemsize
-        print >> output, "bytestride: ", bs
-    print >> output, "itemsize: ", obj.itemsize
-    print >> output, "aligned: ", bp(obj.flags.aligned)
-    print >> output, "contiguous: ", bp(obj.flags.contiguous)
+        print("bytestride: ", bs, file=output)
+    print("itemsize: ", obj.itemsize, file=output)
+    print("aligned: ", bp(obj.flags.aligned), file=output)
+    print("contiguous: ", bp(obj.flags.contiguous), file=output)
     if numpy:
-        print >> output, "fortran: ", obj.flags.fortran
+        print("fortran: ", obj.flags.fortran, file=output)
     if not numpy:
-        print >> output, "buffer: ", repr(obj.data)
+        print("buffer: ", repr(obj.data), file=output)
     if not numpy:
         extra = " (DEBUG ONLY)"
         tic = "'"
     else:
         extra = ""
         tic = ""
-    print >> output, "data pointer: %s%s" % (hex(obj.ctypes._as_parameter_.value), extra)
-    print >> output, "byteorder: ",
+    print("data pointer: %s%s" % (hex(obj.ctypes._as_parameter_.value), extra), file=output)
+    print("byteorder: ", end=' ', file=output)
     endian = obj.dtype.byteorder
     if endian in ['|','=']:
-        print >> output, "%s%s%s" % (tic, sys.byteorder, tic)
+        print("%s%s%s" % (tic, sys.byteorder, tic), file=output)
         byteswap = False
     elif endian == '>':
-        print >> output, "%sbig%s" % (tic, tic)
+        print("%sbig%s" % (tic, tic), file=output)
         byteswap = sys.byteorder != "big"
     else:
-        print >> output, "%slittle%s" % (tic, tic)
+        print("%slittle%s" % (tic, tic), file=output)
         byteswap = sys.byteorder != "little"
-    print >> output, "byteswap: ", bp(byteswap)
+    print("byteswap: ", bp(byteswap), file=output)
     if not numpy:
-        print >> output, "type: ", typefrom(obj).name
+        print("type: ", typefrom(obj).name, file=output)
     else:
-        print >> output, "type: %s" % obj.dtype
+        print("type: %s" % obj.dtype, file=output)
 
 #clipmode is ignored if axis is not 0 and array is not 1d
 def put(array, indices, values, axis=0, clipmode=RAISE):
diff --git a/numpy/numarray/image.py b/numpy/numarray/image.py
index bcfa09afd..063e51376 100644
--- a/numpy/numarray/image.py
+++ b/numpy/numarray/image.py
@@ -1,4 +1,4 @@
-from __future__ import division, absolute_import
+from __future__ import division, absolute_import, print_function
 
 try:
     from stsci.image import *
diff --git a/numpy/numarray/linear_algebra.py b/numpy/numarray/linear_algebra.py
index 3b92d09d1..6cf22329e 100644
--- a/numpy/numarray/linear_algebra.py
+++ b/numpy/numarray/linear_algebra.py
@@ -1,4 +1,4 @@
-from __future__ import division, absolute_import
+from __future__ import division, absolute_import, print_function
 
 from numpy.oldnumeric.linear_algebra import *
 
diff --git a/numpy/numarray/ma.py b/numpy/numarray/ma.py
index f220362ae..dbfd3d2f5 100644
--- a/numpy/numarray/ma.py
+++ b/numpy/numarray/ma.py
@@ -1,3 +1,3 @@
-from __future__ import division, absolute_import
+from __future__ import division, absolute_import, print_function
 
 from numpy.oldnumeric.ma import *
diff --git a/numpy/numarray/matrix.py b/numpy/numarray/matrix.py
index bd10f8278..e88fc086f 100644
--- a/numpy/numarray/matrix.py
+++ b/numpy/numarray/matrix.py
@@ -1,4 +1,4 @@
-from __future__ import division, absolute_import
+from __future__ import division, absolute_import, print_function
 
 __all__ = ['Matrix']
 
diff --git a/numpy/numarray/mlab.py b/numpy/numarray/mlab.py
index d530c8a05..c5b9194ee 100644
--- a/numpy/numarray/mlab.py
+++ b/numpy/numarray/mlab.py
@@ -1,4 +1,4 @@
-from __future__ import division, absolute_import
+from __future__ import division, absolute_import, print_function
 
 from numpy.oldnumeric.mlab import *
 import numpy.oldnumeric.mlab as nom
diff --git a/numpy/numarray/nd_image.py b/numpy/numarray/nd_image.py
index d73788ed3..224d2ba23 100644
--- a/numpy/numarray/nd_image.py
+++ b/numpy/numarray/nd_image.py
@@ -1,4 +1,4 @@
-from __future__ import division, absolute_import
+from __future__ import division, absolute_import, print_function
 
 try:
     from ndimage import *
diff --git a/numpy/numarray/numerictypes.py b/numpy/numarray/numerictypes.py
index b51706ec3..caf40cf45 100644
--- a/numpy/numarray/numerictypes.py
+++ b/numpy/numarray/numerictypes.py
@@ -27,7 +27,7 @@ Exported symbols include:
 $Id: numerictypes.py,v 1.55 2005/12/01 16:22:03 jaytmiller Exp $
 
 """
-from __future__ import division, absolute_import
+from __future__ import division, absolute_import, print_function
 
 
 __all__ = ['NumericType','HasUInt64','typeDict','IsType',
diff --git a/numpy/numarray/random_array.py b/numpy/numarray/random_array.py
index 6f56e9cf9..2edb171a2 100644
--- a/numpy/numarray/random_array.py
+++ b/numpy/numarray/random_array.py
@@ -1,4 +1,4 @@
-from __future__ import division, absolute_import
+from __future__ import division, absolute_import, print_function
 
 __all__ = ['ArgumentError', 'F', 'beta', 'binomial', 'chi_square',
            'exponential', 'gamma', 'get_seed', 'multinomial',
diff --git a/numpy/numarray/session.py b/numpy/numarray/session.py
index 32a28cca0..818c57bc8 100644
--- a/numpy/numarray/session.py
+++ b/numpy/numarray/session.py
@@ -72,7 +72,7 @@ Saved modules are re-imported at load time but any "state" in the module
 which is not restored by a simple import is lost.
 
 """
-from __future__ import division, absolute_import
+from __future__ import division, absolute_import, print_function
 
 __all__ = ['load', 'save']
 
@@ -126,8 +126,8 @@ def _callers_modules():
 
 def _errout(*args):
     for a in args:
-        print >>sys.stderr, a,
-    print >>sys.stderr
+        print(a, end=' ', file=sys.stderr)
+    print(file=sys.stderr)
 
 def _verbose(*args):
     if VERBOSE:
diff --git a/numpy/numarray/setup.py b/numpy/numarray/setup.py
index ab3f2a4d5..5c9574917 100644
--- a/numpy/numarray/setup.py
+++ b/numpy/numarray/setup.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, print_function
 
 from os.path import join
 
diff --git a/numpy/numarray/ufuncs.py b/numpy/numarray/ufuncs.py
index a5b72c3fb..57fc58c54 100644
--- a/numpy/numarray/ufuncs.py
+++ b/numpy/numarray/ufuncs.py
@@ -1,4 +1,4 @@
-from __future__ import division, absolute_import
+from __future__ import division, absolute_import, print_function
 
 __all__ = ['abs', 'absolute', 'add', 'arccos', 'arccosh', 'arcsin', 'arcsinh',
            'arctan', 'arctan2', 'arctanh', 'bitwise_and', 'bitwise_not',
diff --git a/numpy/numarray/util.py b/numpy/numarray/util.py
index acdb18fc8..b8e37a28d 100644
--- a/numpy/numarray/util.py
+++ b/numpy/numarray/util.py
@@ -1,4 +1,4 @@
-from __future__ import division, absolute_import
+from __future__ import division, absolute_import, print_function
 
 import os
 import numpy as np
@@ -23,22 +23,22 @@ def handleError(errorStatus, sourcemsg):
     modes = np.geterr()
     if errorStatus & np.FPE_INVALID:
         if modes['invalid'] == "warn":
-            print "Warning: Encountered invalid numeric result(s)", sourcemsg
+            print("Warning: Encountered invalid numeric result(s)", sourcemsg)
         if modes['invalid'] == "raise":
             raise MathDomainError(sourcemsg)
     if errorStatus & np.FPE_DIVIDEBYZERO:
         if modes['dividebyzero'] == "warn":
-            print "Warning: Encountered divide by zero(s)", sourcemsg
+            print("Warning: Encountered divide by zero(s)", sourcemsg)
         if modes['dividebyzero'] == "raise":
             raise ZeroDivisionError(sourcemsg)
     if errorStatus & np.FPE_OVERFLOW:
         if modes['overflow'] == "warn":
-            print "Warning: Encountered overflow(s)", sourcemsg
+            print("Warning: Encountered overflow(s)", sourcemsg)
         if modes['overflow'] == "raise":
             raise NumOverflowError(sourcemsg)
     if errorStatus & np.FPE_UNDERFLOW:
         if modes['underflow'] == "warn":
-            print "Warning: Encountered underflow(s)", sourcemsg
+            print("Warning: Encountered underflow(s)", sourcemsg)
         if modes['underflow'] == "raise":
             raise UnderflowError(sourcemsg)