[Numpy-svn] r5743 - in trunk: doc/numpybook doc/numpybook/comparison doc/numpybook/comparison/ctypes doc/numpybook/comparison/pyrex doc/numpybook/comparison/weave numpy/core numpy/core/code_generators numpy/distutils/command numpy/doc numpy/lib numpy/lib/tests numpy/ma numpy/testing tools/osxbuild tools/win32build

numpy-svn@scip... numpy-svn@scip...
Tue Sep 2 15:32:52 CDT 2008


Author: jarrod.millman
Date: 2008-09-02 15:32:38 -0500 (Tue, 02 Sep 2008)
New Revision: 5743

Modified:
   trunk/doc/numpybook/comparison/ctypes/filter.py
   trunk/doc/numpybook/comparison/ctypes/interface.py
   trunk/doc/numpybook/comparison/pyrex/setup.py
   trunk/doc/numpybook/comparison/timing.py
   trunk/doc/numpybook/comparison/weave/filter.py
   trunk/doc/numpybook/comparison/weave/inline.py
   trunk/doc/numpybook/runcode.py
   trunk/numpy/core/code_generators/generate_umath.py
   trunk/numpy/core/memmap.py
   trunk/numpy/distutils/command/scons.py
   trunk/numpy/doc/subclassing.py
   trunk/numpy/lib/_datasource.py
   trunk/numpy/lib/scimath.py
   trunk/numpy/lib/tests/test_format.py
   trunk/numpy/lib/ufunclike.py
   trunk/numpy/ma/core.py
   trunk/numpy/testing/nosetester.py
   trunk/numpy/testing/parametric.py
   trunk/tools/osxbuild/build.py
   trunk/tools/osxbuild/install_and_test.py
   trunk/tools/win32build/build.py
   trunk/tools/win32build/prepare_bootstrap.py
Log:
reindenting prior to release


Modified: trunk/doc/numpybook/comparison/ctypes/filter.py
===================================================================
--- trunk/doc/numpybook/comparison/ctypes/filter.py	2008-09-02 20:13:17 UTC (rev 5742)
+++ trunk/doc/numpybook/comparison/ctypes/filter.py	2008-09-02 20:32:38 UTC (rev 5743)
@@ -21,6 +21,3 @@
     b = N.zeros_like(a)
     lib.dfilter2d(a, b, a.ctypes.strides, a.ctypes.shape)
     return b
-    
-
-

Modified: trunk/doc/numpybook/comparison/ctypes/interface.py
===================================================================
--- trunk/doc/numpybook/comparison/ctypes/interface.py	2008-09-02 20:13:17 UTC (rev 5742)
+++ trunk/doc/numpybook/comparison/ctypes/interface.py	2008-09-02 20:32:38 UTC (rev 5743)
@@ -27,7 +27,7 @@
                                                 flags='aligned, contiguous,'\
                                                 'writeable'),
                           ctypes.POINTER(N.ctypeslib.c_intp),
-                          ctypes.POINTER(N.ctypeslib.c_intp)]        
+                          ctypes.POINTER(N.ctypeslib.c_intp)]
 
 def select(dtype):
     if dtype.char in ['?bBhHf']:
@@ -49,12 +49,9 @@
     c = N.empty_like(a)
     func(a,b,c,a.size)
     return c
- 
+
 def filter2d(a):
     a = N.require(a, float, ['ALIGNED'])
     b = N.zeros_like(a)
     lib.dfilter2d(a, b, a.ctypes.strides, a.ctypes.shape)
     return b
-    
-
-

Modified: trunk/doc/numpybook/comparison/pyrex/setup.py
===================================================================
--- trunk/doc/numpybook/comparison/pyrex/setup.py	2008-09-02 20:13:17 UTC (rev 5742)
+++ trunk/doc/numpybook/comparison/pyrex/setup.py	2008-09-02 20:32:38 UTC (rev 5743)
@@ -16,8 +16,8 @@
                  include_dirs = [numpy.get_include()])
 
 pyx_ext2 = Extension('blur',
-		['blur.pyx'],
-		include_dirs = [numpy.get_include()])
+                ['blur.pyx'],
+                include_dirs = [numpy.get_include()])
 
 
 # Call the routine which does the real work

Modified: trunk/doc/numpybook/comparison/timing.py
===================================================================
--- trunk/doc/numpybook/comparison/timing.py	2008-09-02 20:13:17 UTC (rev 5742)
+++ trunk/doc/numpybook/comparison/timing.py	2008-09-02 20:32:38 UTC (rev 5743)
@@ -51,13 +51,11 @@
 path = sys.path
 
 for kind in ['f2py']:#['ctypes', 'pyrex', 'weave', 'f2py']:
-        res[kind] = []
-        sys.path = ['/Users/oliphant/numpybook/%s' % (kind,)] + path
-        print sys.path
-        for n in 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)
-
-
+    res[kind] = []
+    sys.path = ['/Users/oliphant/numpybook/%s' % (kind,)] + path
+    print sys.path
+    for n in 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)

Modified: trunk/doc/numpybook/comparison/weave/filter.py
===================================================================
--- trunk/doc/numpybook/comparison/weave/filter.py	2008-09-02 20:13:17 UTC (rev 5742)
+++ trunk/doc/numpybook/comparison/weave/filter.py	2008-09-02 20:32:38 UTC (rev 5743)
@@ -8,11 +8,11 @@
     for(i=1;i<Na[0]-1;i++) {
         for(j=1;j<Na[1]-1;j++) {
             B2(i,j) = A2(i,j) + (A2(i-1,j) +
-                      A2(i+1,j) + A2(i,j-1) 
-                      + A2(i,j+1))*0.5 
-                      + (A2(i-1,j-1) 
-                      + A2(i-1,j+1) 
-                      + A2(i+1,j-1) 
+                      A2(i+1,j) + A2(i,j-1)
+                      + A2(i,j+1))*0.5
+                      + (A2(i-1,j-1)
+                      + A2(i-1,j+1)
+                      + A2(i+1,j-1)
                       + A2(i+1,j+1))*0.25;
         }
     }
@@ -20,4 +20,3 @@
     b = zeros_like(a)
     weave.inline(code,['a','b'])
     return b
-

Modified: trunk/doc/numpybook/comparison/weave/inline.py
===================================================================
--- trunk/doc/numpybook/comparison/weave/inline.py	2008-09-02 20:13:17 UTC (rev 5742)
+++ trunk/doc/numpybook/comparison/weave/inline.py	2008-09-02 20:32:38 UTC (rev 5743)
@@ -24,11 +24,11 @@
     for(i=1;i<Na[0]-1;i++) {
         for(j=1;j<Na[1]-1;j++) {
             B2(i,j) = A2(i,j) + A2(i-1,j)*0.5 +
-                      A2(i+1,j)*0.5 + A2(i,j-1)*0.5 
-                      + A2(i,j+1)*0.5 
-                      + A2(i-1,j-1)*0.25 
-                      + A2(i-1,j+1)*0.25 
-                      + A2(i+1,j-1)*0.25 
+                      A2(i+1,j)*0.5 + A2(i,j-1)*0.5
+                      + A2(i,j+1)*0.5
+                      + A2(i-1,j-1)*0.25
+                      + A2(i-1,j+1)*0.25
+                      + A2(i+1,j-1)*0.25
                       + A2(i+1,j+1)*0.25;
         }
     }

Modified: trunk/doc/numpybook/runcode.py
===================================================================
--- trunk/doc/numpybook/runcode.py	2008-09-02 20:13:17 UTC (rev 5742)
+++ trunk/doc/numpybook/runcode.py	2008-09-02 20:32:38 UTC (rev 5743)
@@ -11,7 +11,7 @@
 #
 # Options:
 #   -n name of code section  (default MyCode)
-#   
+#
 
 import sys
 import optparse
@@ -23,13 +23,13 @@
 
 def getoutput(tstr, dic):
     print "\n\nRunning..."
-    print tstr,    
+    print tstr,
     tempstr = cStringIO.StringIO()
     sys.stdout = tempstr
     code = compile(tstr, '<input>', 'exec')
     try:
         res = eval(tstr, dic)
-        sys.stdout = sys.__stdout__        
+        sys.stdout = sys.__stdout__
     except SyntaxError:
         try:
             res = None
@@ -42,7 +42,7 @@
         res = tempstr.getvalue() + '\n' + repr(res)
     if res != '':
         print "\nOutput is"
-        print res,   
+        print res,
     return res
 
 # now find the code in the code segment
@@ -75,8 +75,8 @@
         if line != 'dummy':
             outlines.append(line)
     return "\n\\newline \n".join(outlines), end
-            
 
+
 def runpycode(lyxstr, name='MyCode'):
     schobj = re.compile(r"\\layout %s\s+>>> " % name)
     outstr = cStringIO.StringIO()
@@ -85,7 +85,7 @@
     for it in schobj.finditer(lyxstr):
         indx.extend([it.start(), it.end()])
         num += 1
-        
+
     if num == 0:
         print "Nothing found for %s" % name
         return lyxstr
@@ -103,14 +103,14 @@
     for k in range(num):
         # first write everything up to the start of the code segment
         substr = lyxstr[start:indx[2*k]]
-        outstr.write(substr)        
+        outstr.write(substr)
         if start > 0:
             mat = newre.search(substr)
             # if PYNEW found, then start a new namespace
             if mat:
                 edic = {}
                 exec 'from numpy import *' in edic
-                exec 'set_printoptions(linewidth=65)' in edic               
+                exec 'set_printoptions(linewidth=65)' in edic
         # now find the code in the code segment
         # endoutput will contain the index just past any output
         #  already present in the lyx string.

Modified: trunk/numpy/core/code_generators/generate_umath.py
===================================================================
--- trunk/numpy/core/code_generators/generate_umath.py	2008-09-02 20:13:17 UTC (rev 5742)
+++ trunk/numpy/core/code_generators/generate_umath.py	2008-09-02 20:32:38 UTC (rev 5743)
@@ -673,10 +673,10 @@
         mlist = []
         docstring = textwrap.dedent(uf.docstring).strip()
         docstring = docstring.encode('string-escape').replace(r'"', r'\"')
-	# Split the docstring because some compilers (like MS) do not like big
-	# string literal in C code. We split at endlines because textwrap.wrap
-	# do not play well with \n
-	docstring = '\\n\"\"'.join(docstring.split(r"\n"))
+        # Split the docstring because some compilers (like MS) do not like big
+        # string literal in C code. We split at endlines because textwrap.wrap
+        # do not play well with \n
+        docstring = '\\n\"\"'.join(docstring.split(r"\n"))
         mlist.append(\
 r"""f = PyUFunc_FromFuncAndData(%s_functions, %s_data, %s_signatures, %d,
                                 %d, %d, %s, "%s",

Modified: trunk/numpy/core/memmap.py
===================================================================
--- trunk/numpy/core/memmap.py	2008-09-02 20:13:17 UTC (rev 5742)
+++ trunk/numpy/core/memmap.py	2008-09-02 20:32:38 UTC (rev 5743)
@@ -74,7 +74,7 @@
     Given a memmap ``fp``, ``isinstance(fp, numpy.ndarray)`` returns
     ``True``.
 
-    Notes 
+    Notes
     -----
 
     Memory-mapped arrays use the the Python memory-map object which

Modified: trunk/numpy/distutils/command/scons.py
===================================================================
--- trunk/numpy/distutils/command/scons.py	2008-09-02 20:13:17 UTC (rev 5742)
+++ trunk/numpy/distutils/command/scons.py	2008-09-02 20:32:38 UTC (rev 5743)
@@ -287,11 +287,11 @@
             self.post_hooks = []
             self.pkg_names = []
 
-	# To avoid trouble, just don't do anything if no sconscripts are used.
-	# This is  useful when for example f2py uses numpy.distutils, because
-	# f2py does not pass compiler information to scons command, and the
-	# compilation setup below can crash in some situation.
-	if len(self.sconscripts) > 0:
+        # To avoid trouble, just don't do anything if no sconscripts are used.
+        # This is  useful when for example f2py uses numpy.distutils, because
+        # f2py does not pass compiler information to scons command, and the
+        # compilation setup below can crash in some situation.
+        if len(self.sconscripts) > 0:
             # Try to get the same compiler than the ones used by distutils: this is
             # non trivial because distutils and scons have totally different
             # conventions on this one (distutils uses PATH from user's environment,

Modified: trunk/numpy/doc/subclassing.py
===================================================================
--- trunk/numpy/doc/subclassing.py	2008-09-02 20:13:17 UTC (rev 5742)
+++ trunk/numpy/doc/subclassing.py	2008-09-02 20:32:38 UTC (rev 5743)
@@ -7,7 +7,7 @@
 -------
 
 This page is based with thanks on the wiki page on subclassing by Pierre
-Gerard-Marchant - http://www.scipy.org/Subclasses. 
+Gerard-Marchant - http://www.scipy.org/Subclasses.
 
 Introduction
 ------------
@@ -40,21 +40,21 @@
 
 To allow subclassing, and views of subclasses, ndarray uses the
 ndarray ``__new__`` method for the main work of object initialization,
-rather then the more usual ``__init__`` method.  
+rather then the more usual ``__init__`` method.
 
 ``__new__`` and ``__init__``
 ============================
 
 ``__new__`` is a standard python method, and, if present, is called
 before ``__init__`` when we create a class instance. Consider the
-following::  
+following::
 
   class C(object):
       def __new__(cls, *args):
-	  print 'Args in __new__:', args
-	  return object.__new__(cls, *args)
+          print 'Args in __new__:', args
+          return object.__new__(cls, *args)
       def __init__(self, *args):
-	  print 'Args in __init__:', args
+          print 'Args in __init__:', args
 
   C('hello')
 
@@ -75,7 +75,7 @@
 As you can see, the object can be initialized in the ``__new__``
 method or the ``__init__`` method, or both, and in fact ndarray does
 not have an ``__init__`` method, because all the initialization is
-done in the ``__new__`` method. 
+done in the ``__new__`` method.
 
 Why use ``__new__`` rather than just the usual ``__init__``?  Because
 in some cases, as for ndarray, we want to be able to return an object
@@ -83,21 +83,21 @@
 
   class C(object):
       def __new__(cls, *args):
-	  print 'cls is:', cls
-	  print 'Args in __new__:', args
-	  return object.__new__(cls, *args)
+          print 'cls is:', cls
+          print 'Args in __new__:', args
+          return object.__new__(cls, *args)
       def __init__(self, *args):
-	  print 'self is :', self
-	  print 'Args in __init__:', args
+          print 'self is :', self
+          print 'Args in __init__:', args
 
   class D(C):
       def __new__(cls, *args):
-	  print 'D cls is:', cls
-	  print 'D args in __new__:', args
-	  return C.__new__(C, *args)
+          print 'D cls is:', cls
+          print 'D args in __new__:', args
+          return C.__new__(C, *args)
       def __init__(self, *args):
-	  print 'D self is :', self
-	  print 'D args in __init__:', args
+          print 'D self is :', self
+          print 'D args in __init__:', args
 
   D('hello')
 
@@ -131,7 +131,7 @@
 ``__new__`` method knows nothing of what we have done in our own
 ``__new__`` method in order to set attributes, and so on.  (Aside -
 why not call ``obj = subdtype.__new__(...`` then?  Because we may not
-have a ``__new__`` method with the same call signature).  
+have a ``__new__`` method with the same call signature).
 
 So, when creating a new view object of our subclass, we need to be
 able to set any extra attributes from the original object of our
@@ -153,21 +153,21 @@
   class InfoArray(np.ndarray):
 
       def __new__(subtype, shape, dtype=float, buffer=None, offset=0,
-	    strides=None, order=None, info=None):
-	  # Create the ndarray instance of our type, given the usual
-	  # input arguments.  This will call the standard ndarray
-	  # constructor, but return an object of our type
-	  obj = np.ndarray.__new__(subtype, shape, dtype, buffer, offset, strides,
-			   order)
-	  # add the new attribute to the created instance
-	  obj.info = info
-	  # Finally, we must return the newly created object:
-	  return obj
+            strides=None, order=None, info=None):
+          # Create the ndarray instance of our type, given the usual
+          # input arguments.  This will call the standard ndarray
+          # constructor, but return an object of our type
+          obj = np.ndarray.__new__(subtype, shape, dtype, buffer, offset, strides,
+                           order)
+          # add the new attribute to the created instance
+          obj.info = info
+          # Finally, we must return the newly created object:
+          return obj
 
       def __array_finalize__(self,obj):
-	  # reset the attribute from passed original object
-	  self.info = getattr(obj, 'info', None)
-	  # We do not need to return anything
+          # reset the attribute from passed original object
+          self.info = getattr(obj, 'info', None)
+          # We do not need to return anything
 
   obj = InfoArray(shape=(3,), info='information')
   print type(obj)
@@ -200,18 +200,18 @@
   class RealisticInfoArray(np.ndarray):
 
       def __new__(cls, input_array, info=None):
-	  # Input array is an already formed ndarray instance
-	  # We first cast to be our class type
-	  obj = np.asarray(input_array).view(cls)
-	  # add the new attribute to the created instance
-	  obj.info = info
-	  # Finally, we must return the newly created object:
-	  return obj
+          # Input array is an already formed ndarray instance
+          # We first cast to be our class type
+          obj = np.asarray(input_array).view(cls)
+          # add the new attribute to the created instance
+          obj.info = info
+          # Finally, we must return the newly created object:
+          return obj
 
       def __array_finalize__(self,obj):
-	  # reset the attribute from passed original object
-	  self.info = getattr(obj, 'info', None)
-	  # We do not need to return anything
+          # reset the attribute from passed original object
+          self.info = getattr(obj, 'info', None)
+          # We do not need to return anything
 
   arr = np.arange(5)
   obj = RealisticInfoArray(arr, info='information')

Modified: trunk/numpy/lib/_datasource.py
===================================================================
--- trunk/numpy/lib/_datasource.py	2008-09-02 20:13:17 UTC (rev 5742)
+++ trunk/numpy/lib/_datasource.py	2008-09-02 20:32:38 UTC (rev 5743)
@@ -38,7 +38,7 @@
 from shutil import rmtree
 
 # Using a class instead of a module-level dictionary
-# to reduce the inital 'import numpy' overhead by 
+# to reduce the inital 'import numpy' overhead by
 # deferring the import of bz2 and gzip until needed
 
 # TODO: .zip support, .tar support?
@@ -197,7 +197,7 @@
 
     def _isurl(self, path):
         """Test if path is a net location.  Tests the scheme and netloc."""
-        
+
         # We do this here to reduce the 'import numpy' initial import time.
         from urlparse import urlparse
 

Modified: trunk/numpy/lib/scimath.py
===================================================================
--- trunk/numpy/lib/scimath.py	2008-09-02 20:13:17 UTC (rev 5742)
+++ trunk/numpy/lib/scimath.py	2008-09-02 20:32:38 UTC (rev 5743)
@@ -198,15 +198,15 @@
 
     As the numpy.sqrt, this returns the principal square root of x, which is
     what most people mean when they use square root; the principal square root
-    of x is not any number z such as z^2 = x. 
+    of x is not any number z such as z^2 = x.
 
     For positive numbers, the principal square root is defined as the positive
-    number z such as z^2 = x. 
+    number z such as z^2 = x.
 
     The principal square root of -1 is i, the principal square root of any
     negative number -x is defined a i * sqrt(x). For any non zero complex
     number, it is defined by using the following branch cut: x = r e^(i t) with
-    r > 0 and -pi < t <= pi. The principal square root is then 
+    r > 0 and -pi < t <= pi. The principal square root is then
     sqrt(r) e^(i t/2).
     """
     x = _fix_real_lt_zero(x)

Modified: trunk/numpy/lib/tests/test_format.py
===================================================================
--- trunk/numpy/lib/tests/test_format.py	2008-09-02 20:13:17 UTC (rev 5742)
+++ trunk/numpy/lib/tests/test_format.py	2008-09-02 20:32:38 UTC (rev 5743)
@@ -434,13 +434,13 @@
                 format.write_array(fp, arr)
             finally:
                 fp.close()
-    
+
             fortran_order = (arr.flags.f_contiguous and not arr.flags.c_contiguous)
             ma = format.open_memmap(mfn, mode='w+', dtype=arr.dtype,
                 shape=arr.shape, fortran_order=fortran_order)
             ma[...] = arr
             del ma
-    
+
             # Check that both of these files' contents are the same.
             fp = open(nfn, 'rb')
             normal_bytes = fp.read()
@@ -449,7 +449,7 @@
             memmap_bytes = fp.read()
             fp.close()
             yield assert_equal, normal_bytes, memmap_bytes
-    
+
             # Check that reading the file using memmap works.
             ma = format.open_memmap(nfn, mode='r')
             #yield assert_array_equal, ma, arr

Modified: trunk/numpy/lib/ufunclike.py
===================================================================
--- trunk/numpy/lib/ufunclike.py	2008-09-02 20:13:17 UTC (rev 5742)
+++ trunk/numpy/lib/ufunclike.py	2008-09-02 20:32:38 UTC (rev 5743)
@@ -10,12 +10,12 @@
     """ Round x to nearest integer towards zero.
     """
     x = nx.asanyarray(x)
-    if y is None: 
+    if y is None:
         y = nx.zeros_like(x)
     y1 = nx.floor(x)
     y2 = nx.ceil(x)
     y[...] = nx.where(x >= 0, y1, y2)
-    return y 
+    return y
 
 def isposinf(x, y=None):
     """

Modified: trunk/numpy/ma/core.py
===================================================================
--- trunk/numpy/ma/core.py	2008-09-02 20:13:17 UTC (rev 5742)
+++ trunk/numpy/ma/core.py	2008-09-02 20:32:38 UTC (rev 5743)
@@ -86,7 +86,7 @@
         return
     newdoc = """
     %s
-    
+
     Notes
     -----
     %s
@@ -896,7 +896,7 @@
     """
     cond = make_mask(condition)
     a = np.array(a, copy=copy, subok=True)
-    
+
     (cshape, ashape) = (cond.shape, a.shape)
     if cshape and cshape != ashape:
         raise IndexError("Inconsistant shape between the condition and the input"\
@@ -3865,7 +3865,7 @@
     if len(fb.shape) == 0:
         fb.shape = (1,)
     return np.inner(fa, fb).view(MaskedArray)
-inner.__doc__ = doc_note(np.inner.__doc__, 
+inner.__doc__ = doc_note(np.inner.__doc__,
                          "Masked values are replaced by 0.")
 innerproduct = inner
 

Modified: trunk/numpy/testing/nosetester.py
===================================================================
--- trunk/numpy/testing/nosetester.py	2008-09-02 20:13:17 UTC (rev 5742)
+++ trunk/numpy/testing/nosetester.py	2008-09-02 20:32:38 UTC (rev 5743)
@@ -164,8 +164,8 @@
         pyversion = sys.version.replace('\n','')
         print "Python version %s" % pyversion
         print "nose version %d.%d.%d" % nose.__versioninfo__
-            
 
+
     def test(self, label='fast', verbose=1, extra_argv=None, doctests=False,
              coverage=False, **kwargs):
         ''' Run tests for module using nose

Modified: trunk/numpy/testing/parametric.py
===================================================================
--- trunk/numpy/testing/parametric.py	2008-09-02 20:13:17 UTC (rev 5742)
+++ trunk/numpy/testing/parametric.py	2008-09-02 20:32:38 UTC (rev 5743)
@@ -61,9 +61,9 @@
     _shareParTestPrefix = 'testsp'
 
     def __init__(self, methodName = 'runTest'):
-    	warnings.warn("ParametricTestCase will be removed in the next NumPy "
+        warnings.warn("ParametricTestCase will be removed in the next NumPy "
                       "release", DeprecationWarning)
-	unittest.TestCase.__init__(self, methodName)
+        unittest.TestCase.__init__(self, methodName)
 
     def exec_test(self,test,args,result):
         """Execute a single test.  Returns a success boolean"""

Modified: trunk/tools/osxbuild/build.py
===================================================================
--- trunk/tools/osxbuild/build.py	2008-09-02 20:13:17 UTC (rev 5742)
+++ trunk/tools/osxbuild/build.py	2008-09-02 20:32:38 UTC (rev 5743)
@@ -36,7 +36,7 @@
         cmd = 'sudo chown -R %s %s' % (getuser(), DIST_DIR)
         shellcmd(cmd)
         shutil.rmtree(DIST_DIR)
-        
+
 def build_dist():
     print 'Building distribution... (using sudo)'
     cmd = 'sudo python setupegg.py bdist_mpkg'
@@ -67,7 +67,7 @@
     print 'Reverting README.txt...'
     cmd = 'svn revert %s' % DEV_README
     shellcmd(cmd)
-                
+
 def shellcmd(cmd, verbose=True):
     """Call a shell command."""
     if verbose:
@@ -80,7 +80,7 @@
         %s
         """ % str(err)
         raise Exception(msg)
-    
+
 def build():
     # update end-user documentation
     copy_readme()
@@ -99,6 +99,6 @@
     os.chdir(cwd)
     # restore developer documentation
     revert_readme()
-    
+
 if __name__ == '__main__':
     build()

Modified: trunk/tools/osxbuild/install_and_test.py
===================================================================
--- trunk/tools/osxbuild/install_and_test.py	2008-09-02 20:13:17 UTC (rev 5742)
+++ trunk/tools/osxbuild/install_and_test.py	2008-09-02 20:32:38 UTC (rev 5743)
@@ -14,7 +14,7 @@
     """Add color to this print output."""
     clrmsg = clrgreen + msg + clrnull
     print clrmsg
-    
+
 distdir = os.path.join(SRC_DIR, DIST_DIR)
 
 # Find the package and build abspath to it

Modified: trunk/tools/win32build/build.py
===================================================================
--- trunk/tools/win32build/build.py	2008-09-02 20:13:17 UTC (rev 5742)
+++ trunk/tools/win32build/build.py	2008-09-02 20:32:38 UTC (rev 5743)
@@ -80,7 +80,7 @@
     if not os.path.exists("binaries"):
         os.makedirs("binaries")
 
-    shutil.move(os.path.join('dist', get_windist_exec(pyver)), 
+    shutil.move(os.path.join('dist', get_windist_exec(pyver)),
             os.path.join("binaries", get_binary_name(arch)))
 
 def get_numpy_version():
@@ -110,7 +110,7 @@
 if __name__ == '__main__':
     from optparse import OptionParser
     parser = OptionParser()
-    parser.add_option("-a", "--arch", dest="arch", 
+    parser.add_option("-a", "--arch", dest="arch",
                       help = "Architecture to build (sse2, sse3, nosse, etc...)")
     parser.add_option("-p", "--pyver", dest="pyver",
                       help = "Python version (2.4, 2.5, etc...)")

Modified: trunk/tools/win32build/prepare_bootstrap.py
===================================================================
--- trunk/tools/win32build/prepare_bootstrap.py	2008-09-02 20:13:17 UTC (rev 5742)
+++ trunk/tools/win32build/prepare_bootstrap.py	2008-09-02 20:32:38 UTC (rev 5743)
@@ -79,7 +79,7 @@
         version = subprocess.Popen(['python', '-c', 'import __builtin__; __builtin__.__NUMPY_SETUP__ = True; from numpy.version import version;print version'], stdout =  subprocess.PIPE).communicate()[0]
         version = version.strip()
         if 'dev' in version:
-            out = subprocess.Popen(['svn', 'info'], stdout = subprocess.PIPE).communicate()[0] 
+            out = subprocess.Popen(['svn', 'info'], stdout = subprocess.PIPE).communicate()[0]
             r = re.compile('Revision: ([0-9]+)')
             svnver = None
             for line in out.split('\n'):



More information about the Numpy-svn mailing list