[Numpy-svn] r3509 - in branches/splitcode/numpy: . core core/code_generators core/src core/tests distutils distutils/command distutils/fcompiler f2py f2py/lib f2py/lib/parser f2py/tests/array_from_pyobj f2py/tests/c f2py/tests/f77 f2py/tests/f90 fft lib lib/tests linalg numarray oldnumeric oldnumeric/tests random random/mtrand testing tests

numpy-svn at scipy.org numpy-svn at scipy.org
Tue Jan 9 12:25:43 CST 2007


Author: charris
Date: 2007-01-09 12:24:53 -0600 (Tue, 09 Jan 2007)
New Revision: 3509

Modified:
   branches/splitcode/numpy/__init__.py
   branches/splitcode/numpy/add_newdocs.py
   branches/splitcode/numpy/core/_internal.py
   branches/splitcode/numpy/core/arrayprint.py
   branches/splitcode/numpy/core/code_generators/generate_array_api.py
   branches/splitcode/numpy/core/code_generators/generate_umath.py
   branches/splitcode/numpy/core/defchararray.py
   branches/splitcode/numpy/core/defmatrix.py
   branches/splitcode/numpy/core/fromnumeric.py
   branches/splitcode/numpy/core/ma.py
   branches/splitcode/numpy/core/numeric.py
   branches/splitcode/numpy/core/numerictypes.py
   branches/splitcode/numpy/core/records.py
   branches/splitcode/numpy/core/setup.py
   branches/splitcode/numpy/core/src/scalartypes.inc.src
   branches/splitcode/numpy/core/src/ufuncobject.c
   branches/splitcode/numpy/core/tests/test_defmatrix.py
   branches/splitcode/numpy/core/tests/test_errstate.py
   branches/splitcode/numpy/core/tests/test_ma.py
   branches/splitcode/numpy/core/tests/test_multiarray.py
   branches/splitcode/numpy/core/tests/test_numeric.py
   branches/splitcode/numpy/core/tests/test_numerictypes.py
   branches/splitcode/numpy/core/tests/test_regression.py
   branches/splitcode/numpy/core/tests/test_scalarmath.py
   branches/splitcode/numpy/core/tests/test_umath.py
   branches/splitcode/numpy/ctypeslib.py
   branches/splitcode/numpy/distutils/ccompiler.py
   branches/splitcode/numpy/distutils/command/build_clib.py
   branches/splitcode/numpy/distutils/command/config_compiler.py
   branches/splitcode/numpy/distutils/fcompiler/g95.py
   branches/splitcode/numpy/distutils/fcompiler/gnu.py
   branches/splitcode/numpy/distutils/interactive.py
   branches/splitcode/numpy/distutils/misc_util.py
   branches/splitcode/numpy/distutils/system_info.py
   branches/splitcode/numpy/f2py/auxfuncs.py
   branches/splitcode/numpy/f2py/capi_maps.py
   branches/splitcode/numpy/f2py/f2py_testing.py
   branches/splitcode/numpy/f2py/lib/main.py
   branches/splitcode/numpy/f2py/lib/parser/Fortran2003.py
   branches/splitcode/numpy/f2py/lib/parser/base_classes.py
   branches/splitcode/numpy/f2py/lib/parser/block_statements.py
   branches/splitcode/numpy/f2py/lib/parser/parsefortran.py
   branches/splitcode/numpy/f2py/lib/parser/readfortran.py
   branches/splitcode/numpy/f2py/lib/parser/sourceinfo.py
   branches/splitcode/numpy/f2py/lib/parser/splitline.py
   branches/splitcode/numpy/f2py/lib/parser/statements.py
   branches/splitcode/numpy/f2py/lib/parser/test_Fortran2003.py
   branches/splitcode/numpy/f2py/lib/parser/test_parser.py
   branches/splitcode/numpy/f2py/lib/parser/typedecl_statements.py
   branches/splitcode/numpy/f2py/lib/py_wrap.py
   branches/splitcode/numpy/f2py/lib/py_wrap_subprogram.py
   branches/splitcode/numpy/f2py/lib/py_wrap_type.py
   branches/splitcode/numpy/f2py/lib/test_derived_scalar.py
   branches/splitcode/numpy/f2py/lib/test_scalar_function_in.py
   branches/splitcode/numpy/f2py/lib/test_scalar_in_out.py
   branches/splitcode/numpy/f2py/lib/wrapper_base.py
   branches/splitcode/numpy/f2py/rules.py
   branches/splitcode/numpy/f2py/tests/array_from_pyobj/setup.py
   branches/splitcode/numpy/f2py/tests/c/return_real.py
   branches/splitcode/numpy/f2py/tests/f77/callback.py
   branches/splitcode/numpy/f2py/tests/f77/return_character.py
   branches/splitcode/numpy/f2py/tests/f77/return_complex.py
   branches/splitcode/numpy/f2py/tests/f77/return_integer.py
   branches/splitcode/numpy/f2py/tests/f77/return_logical.py
   branches/splitcode/numpy/f2py/tests/f77/return_real.py
   branches/splitcode/numpy/f2py/tests/f90/return_character.py
   branches/splitcode/numpy/f2py/tests/f90/return_complex.py
   branches/splitcode/numpy/f2py/tests/f90/return_integer.py
   branches/splitcode/numpy/f2py/tests/f90/return_logical.py
   branches/splitcode/numpy/fft/fftpack.py
   branches/splitcode/numpy/fft/helper.py
   branches/splitcode/numpy/fft/setup.py
   branches/splitcode/numpy/lib/__init__.py
   branches/splitcode/numpy/lib/arraysetops.py
   branches/splitcode/numpy/lib/convdtype.py
   branches/splitcode/numpy/lib/function_base.py
   branches/splitcode/numpy/lib/index_tricks.py
   branches/splitcode/numpy/lib/polynomial.py
   branches/splitcode/numpy/lib/setup.py
   branches/splitcode/numpy/lib/shape_base.py
   branches/splitcode/numpy/lib/tests/test_arraysetops.py
   branches/splitcode/numpy/lib/tests/test_function_base.py
   branches/splitcode/numpy/lib/tests/test_index_tricks.py
   branches/splitcode/numpy/lib/tests/test_polynomial.py
   branches/splitcode/numpy/lib/tests/test_shape_base.py
   branches/splitcode/numpy/lib/tests/test_twodim_base.py
   branches/splitcode/numpy/lib/tests/test_type_check.py
   branches/splitcode/numpy/lib/twodim_base.py
   branches/splitcode/numpy/lib/type_check.py
   branches/splitcode/numpy/lib/user_array.py
   branches/splitcode/numpy/lib/utils.py
   branches/splitcode/numpy/linalg/info.py
   branches/splitcode/numpy/linalg/linalg.py
   branches/splitcode/numpy/linalg/setup.py
   branches/splitcode/numpy/matlib.py
   branches/splitcode/numpy/numarray/alter_code1.py
   branches/splitcode/numpy/numarray/alter_code2.py
   branches/splitcode/numpy/numarray/convolve.py
   branches/splitcode/numpy/numarray/functions.py
   branches/splitcode/numpy/numarray/image.py
   branches/splitcode/numpy/numarray/numerictypes.py
   branches/splitcode/numpy/numarray/session.py
   branches/splitcode/numpy/numarray/setup.py
   branches/splitcode/numpy/numarray/util.py
   branches/splitcode/numpy/oldnumeric/__init__.py
   branches/splitcode/numpy/oldnumeric/alter_code1.py
   branches/splitcode/numpy/oldnumeric/alter_code2.py
   branches/splitcode/numpy/oldnumeric/compat.py
   branches/splitcode/numpy/oldnumeric/fix_default_axis.py
   branches/splitcode/numpy/oldnumeric/functions.py
   branches/splitcode/numpy/oldnumeric/linear_algebra.py
   branches/splitcode/numpy/oldnumeric/matrix.py
   branches/splitcode/numpy/oldnumeric/misc.py
   branches/splitcode/numpy/oldnumeric/mlab.py
   branches/splitcode/numpy/oldnumeric/precision.py
   branches/splitcode/numpy/oldnumeric/random_array.py
   branches/splitcode/numpy/oldnumeric/rng.py
   branches/splitcode/numpy/oldnumeric/tests/test_oldnumeric.py
   branches/splitcode/numpy/oldnumeric/typeconv.py
   branches/splitcode/numpy/oldnumeric/ufuncs.py
   branches/splitcode/numpy/random/mtrand/mtrand.c
   branches/splitcode/numpy/random/setup.py
   branches/splitcode/numpy/testing/info.py
   branches/splitcode/numpy/testing/numpytest.py
   branches/splitcode/numpy/tests/test_ctypeslib.py
Log:
update numpysplit branch to trunk rev 3508

Modified: branches/splitcode/numpy/__init__.py
===================================================================
--- branches/splitcode/numpy/__init__.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/__init__.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -9,7 +9,7 @@
 
 It is being distributed for a fee for only a few years to
 cover some of the costs of development.  After the restriction period
-it will also be freely available. 
+it will also be freely available.
 
 Additional documentation is available in the docstrings and at
 
@@ -53,7 +53,7 @@
     __all__ += core.__all__
     __all__ += lib.__all__
     __all__ += ['linalg', 'fft', 'random', 'ctypeslib']
-        
+
     if __doc__ is not None:
         __doc__ += """
 
@@ -66,23 +66,23 @@
 random    --- Core Random Tools
 linalg    --- Core Linear Algebra Tools
 fft       --- Core FFT routines
-testing   --- Scipy testing tools
+testing   --- Numpy testing tools
 
   These packages require explicit import
-f2py      --- Fortran to Python Interface Generator. 
-distutils --- Enhancements to distutils with support for 
-              Fortran compilers support and more. 
+f2py      --- Fortran to Python Interface Generator.
+distutils --- Enhancements to distutils with support for
+              Fortran compilers support and more.
 
 
 Global symbols from subpackages
 -------------------------------
 core    --> *
 lib     --> *
-testing --> ScipyTest, NumpyTest
+testing --> NumpyTest
 """
 
     def test(level=1, verbosity=1):
-        if level <= 10:	
+        if level <= 10:
            return NumpyTest().test(level, verbosity)
         else:
            return NumpyTest().testall(level, verbosity)

Modified: branches/splitcode/numpy/add_newdocs.py
===================================================================
--- branches/splitcode/numpy/add_newdocs.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/add_newdocs.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -364,8 +364,8 @@
     sorting on key[1], and so forth. The result is a sort on multiple
     keys.  If the keys represented columns of a spreadsheet, for example,
     this would sort using multiple columns (the last key being used for the
-    primary sort order, the second-to-last key for the secondary sort order, 
-    and so on).  The keys argument must be a sequence of things that can be 
+    primary sort order, the second-to-last key for the secondary sort order,
+    and so on).  The keys argument must be a sequence of things that can be
     converted to arrays of the same shape.
 
     """)
@@ -660,7 +660,7 @@
     order -- If a has fields defined, then the order keyword can be the
              field name to sort on or a list (or tuple) of field names
              to indicate the order that fields should be used to define
-             the sort.         
+             the sort.
 
     Returns: array of indices that sort a along the specified axis.
 
@@ -701,7 +701,7 @@
     """a.byteswap(False) -> View or copy. Swap the bytes in the array.
 
     Swap the bytes in the array.  Return the byteswapped array.  If the first
-    argument is TRUE, byteswap in-place and return a reference to self.
+    argument is True, byteswap in-place and return a reference to self.
 
     """))
 
@@ -1035,7 +1035,7 @@
     order -- If a has fields defined, then the order keyword can be the
              field name to sort on or a list (or tuple) of field names
              to indicate the order that fields should be used to define
-             the sort.         
+             the sort.
 
     Returns: None.
 

Modified: branches/splitcode/numpy/core/_internal.py
===================================================================
--- branches/splitcode/numpy/core/_internal.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/core/_internal.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 #A place for code to be called from C-code
 #  that implements more complicated stuff.
 
@@ -40,7 +39,7 @@
     titles = [x[3] for x in allfields]
 
     return names, formats, offsets, titles
-    
+
 # Called in PyArray_DescrConverter function when
 #  a dictionary without "names" and "formats"
 #  fields is used as a data-type descriptor.
@@ -219,7 +218,7 @@
 
     def c_void_p(self, num):
         return num
-    
+
 class _ctypes(object):
     def __init__(self, array, ptr=None):
         try:
@@ -233,7 +232,7 @@
             self._zerod = True
         else:
             self._zerod = False
-    
+
     def data_as(self, obj):
         return self._ctypes.cast(self._data, obj)
 
@@ -246,12 +245,12 @@
         if self._zerod:
             return None
         return (obj*self._arr.ndim)(*self._arr.strides)
-    
+
     def get_data(self):
         return self._data
 
     def get_shape(self):
-        if self._zerod: 
+        if self._zerod:
             return None
         return (_getintp_ctype()*self._arr.ndim)(*self._arr.shape)
 
@@ -262,7 +261,7 @@
 
     def get_as_parameter(self):
         return self._ctypes.c_void_p(self._data)
-    
+
     data = property(get_data, None, doc="c-types data")
     shape = property(get_shape, None, doc="c-types shape")
     strides = property(get_strides, None, doc="c-types strides")

Modified: branches/splitcode/numpy/core/arrayprint.py
===================================================================
--- branches/splitcode/numpy/core/arrayprint.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/core/arrayprint.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -125,8 +125,8 @@
 def _boolFormatter(x):
     if x: return ' True'
     else: return 'False'
-    
 
+
 def _array2string(a, max_line_width, precision, suppress_small, separator=' ',
                   prefix=""):
 

Modified: branches/splitcode/numpy/core/code_generators/generate_array_api.py
===================================================================
--- branches/splitcode/numpy/core/code_generators/generate_array_api.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/core/code_generators/generate_array_api.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -16,8 +16,8 @@
 #ifdef _MULTIARRAYMODULE
 
 typedef struct {
-	PyObject_HEAD
-	npy_bool obval;
+        PyObject_HEAD
+        npy_bool obval;
 } PyBoolScalarObject;
 
 

Modified: branches/splitcode/numpy/core/code_generators/generate_umath.py
===================================================================
--- branches/splitcode/numpy/core/code_generators/generate_umath.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/core/code_generators/generate_umath.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -267,7 +267,7 @@
     Ufunc(2, 1, None,
           'returns minimum (if x1 < x2: x1;  else: x2) elementwise',
           TD(noobj),
-          TD(O, f='_npy_ObjectMin')          
+          TD(O, f='_npy_ObjectMin')
           ),
 'bitwise_and' :
     Ufunc(2, 1, One,

Modified: branches/splitcode/numpy/core/defchararray.py
===================================================================
--- branches/splitcode/numpy/core/defchararray.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/core/defchararray.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -38,7 +38,7 @@
         return self
 
     def __array_finalize__(self, obj):
-        # The b is a special case because it is used for reconstructing. 
+        # The b is a special case because it is used for reconstructing.
         if not _globalvar and self.dtype.char not in 'SUb':
             raise ValueError, "Can only create a chararray from string data."
 
@@ -52,23 +52,23 @@
                 val = temp
         return val
 
-    def __eq__(self, other): 
+    def __eq__(self, other):
         return compare_chararrays(self, other, '==', True)
 
-    def __ne__(self, other): 
+    def __ne__(self, other):
         return compare_chararrays(self, other, '!=', True)
 
     def __ge__(self, other):
-        return compare_chararrays(self, other, '>=', True)        
+        return compare_chararrays(self, other, '>=', True)
 
     def __le__(self, other):
-        return compare_chararrays(self, other, '<=', True)                
+        return compare_chararrays(self, other, '<=', True)
 
     def __gt__(self, other):
         return compare_chararrays(self, other, '>', True)
 
     def __lt__(self, other):
-        return compare_chararrays(self, other, '<', True)        
+        return compare_chararrays(self, other, '<', True)
 
     def __add__(self, other):
         b = broadcast(self, other)

Modified: branches/splitcode/numpy/core/defmatrix.py
===================================================================
--- branches/splitcode/numpy/core/defmatrix.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/core/defmatrix.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,9 +1,7 @@
-
 __all__ = ['matrix', 'bmat', 'mat', 'asmatrix']
 
 import numeric as N
 from numeric import concatenate, isscalar, binary_repr
-import types
 import string as str_
 import sys
 
@@ -135,7 +133,7 @@
         if out.ndim == 0:
             return out[()]
         if out.ndim == 1:
-            sh = out.shape[0] 
+            sh = out.shape[0]
             # Determine when we should have a column array
             try:
                 n = len(index)
@@ -146,15 +144,15 @@
             else:
                 out.shape = (1,sh)
         return out
-            
+
     def _get_truendim(self):
         shp = self.shape
         truend = 0
         for val in shp:
             if (val > 1): truend += 1
         return truend
-        
 
+
     def __mul__(self, other):
         if isinstance(other, N.ndarray) or N.isscalar(other) or \
                not hasattr(other, '__rmul__'):
@@ -239,7 +237,7 @@
         over all dimensions.  This preserves the orientation of the
         result as a row or column.
         """
-        return N.ndarray.sum(self, axis, dtype, out=None)._align(axis)
+        return N.ndarray.sum(self, axis, dtype, out)._align(axis)
 
     def mean(self, axis=None, out=None):
         return N.ndarray.mean(self, axis, out)._align(axis)
@@ -249,28 +247,28 @@
 
     def var(self, axis=None, dtype=None, out=None):
         return N.ndarray.var(self, axis, dtype, out)._align(axis)
-    
+
     def prod(self, axis=None, dtype=None, out=None):
         return N.ndarray.prod(self, axis, dtype, out)._align(axis)
-    
+
     def any(self, axis=None, out=None):
-        return N.ndarray.any(self, axis, out)._align(axis)        
+        return N.ndarray.any(self, axis, out)._align(axis)
 
     def all(self, axis=None, out=None):
         return N.ndarray.all(self, axis, out)._align(axis)
-        
+
     def max(self, axis=None, out=None):
         return N.ndarray.max(self, axis, out)._align(axis)
 
     def argmax(self, axis=None, out=None):
         return N.ndarray.argmax(self, axis, out)._align(axis)
-    
+
     def min(self, axis=None, out=None):
         return N.ndarray.min(self, axis, out)._align(axis)
-    
+
     def argmin(self, axis=None, out=None):
         return N.ndarray.argmin(self, axis, out)._align(axis)
-    
+
     def ptp(self, axis=None, out=None):
         return N.ndarray.ptp(self, axis, out)._align(axis)
 
@@ -289,10 +287,10 @@
 
     def getA(self):
         return self.__array__()
-    
+
     def getA1(self):
         return self.__array__().ravel()
-    
+
     def getT(self):
         return self.transpose()
 
@@ -300,7 +298,7 @@
         if issubclass(self.dtype.type, N.complexfloating):
             return self.transpose().conjugate()
         else:
-            return self.transpose()    
+            return self.transpose()
 
     T = property(getT, None, doc="transpose")
     A = property(getA, None, doc="base array")

Modified: branches/splitcode/numpy/core/fromnumeric.py
===================================================================
--- branches/splitcode/numpy/core/fromnumeric.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/core/fromnumeric.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -14,10 +14,7 @@
 import multiarray as mu
 import umath as um
 import numerictypes as nt
-from numeric import asarray, array, asanyarray, correlate, outer, concatenate
-from umath import sign, absolute, multiply
-import numeric as _nx
-import sys
+from numeric import asarray, array, asanyarray, concatenate
 _dt_ = nt.sctype2char
 
 import types
@@ -124,14 +121,14 @@
 
     axis  -- axis to be sorted (default -1).  Can be None
              to indicate that a flattened and sorted array should
-             be returned (the array method does not support this). 
+             be returned (the array method does not support this).
     kind  -- sorting algorithm (default 'quicksort')
              Possible values: 'quicksort', 'mergesort', or 'heapsort'.
     order -- For an array with fields defined, this argument allows
              specification of which fields to compare first, second,
              etc.  Not all fields need be specified.
-            
 
+
     Returns: None.
 
     This method sorts 'a' in place along the given axis using the algorithm
@@ -171,7 +168,7 @@
 
     axis  -- axis to be indirectly sorted (default -1)
              Can be None to indicate return indices into the
-             flattened array. 
+             flattened array.
     kind  -- sorting algorithm (default 'quicksort')
              Possible values: 'quicksort', 'mergesort', or 'heapsort'
     order -- For an array with fields defined, this argument allows

Modified: branches/splitcode/numpy/core/ma.py
===================================================================
--- branches/splitcode/numpy/core/ma.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/core/ma.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1683,7 +1683,6 @@
                     d = add.reduce(w, axis)
                     del w
                 elif wsh == (ash[axis],):
-                    ni = ash[axis]
                     r = [newaxis]*len(ash)
                     r[axis] = slice(None, None, 1)
                     w = eval ("w["+ repr(tuple(r)) + "] * ones(ash, float)")
@@ -1708,7 +1707,6 @@
                     n = add.reduce(a*w, axis)
                     d = add.reduce(w, axis)
                 elif wsh == (ash[axis],):
-                    ni = ash[axis]
                     r = [newaxis]*len(ash)
                     r[axis] = slice(None, None, 1)
                     w = eval ("w["+ repr(tuple(r)) + "] * masked_array(ones(ash, float), mask)")
@@ -2101,7 +2099,7 @@
         return masked_array(d, m)
     else:
         return masked_array(d, fromnumeric.diagonal(m, k, axis1, axis2))
-    
+
 def trace (a, offset=0, axis1=0, axis2=1, dtype=None, out=None):
     """trace(a,offset=0, axis1=0, axis2=1) returns the sum along diagonals
     (defined by the last two dimenions) of the array.
@@ -2177,7 +2175,7 @@
 del _choose
 
 def _clip(self,a_min,a_max,out=None):
-    return MaskedArray(data = self.data.clip(asarray(a_min).data, 
+    return MaskedArray(data = self.data.clip(asarray(a_min).data,
                                              asarray(a_max).data),
                        mask = mask_or(self.mask,
                                       mask_or(getmask(a_min),getmask(a_max))))
@@ -2215,7 +2213,7 @@
 
 def _max(a, axis=None, out=None):
     if out is not None:
-        raise TypeError("Output arrays Unsupported for masked arrays")    
+        raise TypeError("Output arrays Unsupported for masked arrays")
     if axis is None:
         return maximum(a)
     else:
@@ -2254,7 +2252,7 @@
     except AttributeError:
         result = _wrapit(self, 'squeeze')
     return result
-array.squeeze = _m(_squeeze)      
+array.squeeze = _m(_squeeze)
 
 array.strides = property(_m(not_implemented))
 array.sum = _m(sum)

Modified: branches/splitcode/numpy/core/numeric.py
===================================================================
--- branches/splitcode/numpy/core/numeric.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/core/numeric.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -159,7 +159,7 @@
         subok = 0
     else:
         subok = 1
-        
+
     arr = array(a, dtype=dtype, copy=False, subok=subok)
 
     copychar = 'A'
@@ -176,7 +176,7 @@
         if not arr.flags[prop]:
             arr = arr.copy(copychar)
             break
-    return arr   
+    return arr
 
 def isfortran(a):
     """Returns True if 'a' is arranged in Fortran-order in memory with a.ndim > 1
@@ -240,7 +240,7 @@
 def vdot(a, b):
     """Returns the dot product of 2 vectors (or anything that can be made into
     a vector).
-    
+
     Note: this is not the same as `dot`, as it takes the conjugate of its first
     argument if complex and always returns a scalar."""
     return dot(asarray(a).ravel().conj(), asarray(b).ravel())
@@ -265,7 +265,7 @@
     the axes to be summed over are given by the axes argument.
     the first element of the sequence determines the axis or axes
     in arr1 to sum over, and the second element in axes argument sequence
-    determines the axis or axes in arr2 to sum over. 
+    determines the axis or axes in arr2 to sum over.
 
     When there is more than one axis to sum over, the corresponding
     arguments to axes should be sequences of the same length with the first
@@ -273,7 +273,7 @@
     and so forth.
 
     If the axes argument is an integer, N, then the last N dimensions of a
-    and first N dimensions of b are summed over. 
+    and first N dimensions of b are summed over.
     """
     try:
         iter(axes)
@@ -375,8 +375,8 @@
         raise ValueError, msg % ('axis', axis, n)
     if not (0 <= start < n+1):
         raise ValueError, msg % ('start', start, n+1)
-    if (axis < start): # it's been removed 
-        start -= 1    
+    if (axis < start): # it's been removed
+        start -= 1
     if axis==start:
         return a
     axes = range(0,n)
@@ -488,7 +488,7 @@
 def fromfunction(function, shape, **kwargs):
     """Returns an array constructed by calling a function on a tuple of number
     grids.
-    
+
     The function should accept as many arguments as the length of shape and work
     on array inputs.  The shape argument is a sequence of numbers indicating the
     length of the desired output for each axis.
@@ -496,7 +496,7 @@
     The function can also accept keyword arguments (except dtype), which will be
     passed through fromfunction to the function itself.  The dtype argument
     (default float) determines the data-type of the index grid passed to the
-    function. 
+    function.
     """
     dtype = kwargs.pop('dtype', float)
     args = indices(shape, dtype=dtype)
@@ -532,7 +532,7 @@
     'C':'1100',
     'D':'1101',
     'E':'1110',
-    'F':'1111',    
+    'F':'1111',
     'L':''}
 
 def binary_repr(num):
@@ -698,7 +698,7 @@
     FloatingPointError: overflow encountered in short_scalars
     >>> seterr(all='ignore')
     {'over': 'ignore', 'divide': 'ignore', 'invalid': 'ignore', 'under': 'ignore'}
-    
+
     """
 
     pyvals = umath.geterrobj()
@@ -785,16 +785,16 @@
     """
     return umath.geterrobj()[2]
 
-class _unspecified(object): 
+class _unspecified(object):
     pass
 _Unspecified = _unspecified()
 
 class errstate(object):
     """with errstate(**state): --> operations in following block use given state.
-    
+
     # Set error handling to known state.
-    >>> _ = seterr(invalid='raise', divide='raise', over='raise', under='ignore') 
-    
+    >>> _ = seterr(invalid='raise', divide='raise', over='raise', under='ignore')
+
     |>> a = -arange(3)
     |>> with errstate(invalid='ignore'):
     ...     print sqrt(a)
@@ -812,7 +812,7 @@
     Traceback (most recent call last):
         ...
     FloatingPointError: divide by zero encountered in divide
-    
+
     """
     # Note that we don't want to run the above doctests because they will fail
     # without a from __future__ import with_statement

Modified: branches/splitcode/numpy/core/numerictypes.py
===================================================================
--- branches/splitcode/numpy/core/numerictypes.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/core/numerictypes.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -216,7 +216,7 @@
         Intname = 'Int%d' % bits
         uval = typeinfo['U'+ctype]
         typeobj = val[-1]
-        utypeobj = uval[-1]        
+        utypeobj = uval[-1]
         if intname not in allTypes.keys():
             uintname = 'uint%d' % bits
             allTypes[intname] = typeobj

Modified: branches/splitcode/numpy/core/records.py
===================================================================
--- branches/splitcode/numpy/core/records.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/core/records.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,4 @@
-# All of the functions allow formats to be a dtype 
+# All of the functions allow formats to be a dtype
 __all__ = ['record', 'recarray', 'format_parser']
 
 import numeric as sb
@@ -110,7 +110,7 @@
         if (byteorder is not None):
             byteorder = _byteorderconv[byteorder[0]]
             descr = descr.newbyteorder(byteorder)
-            
+
         self._descr = descr
 
 class record(nt.void):
@@ -129,7 +129,7 @@
             pass
         fielddict = nt.void.__getattribute__(self, 'dtype').fields
         res = fielddict.get(attr,None)
-        if res:            
+        if res:
             obj = self.getfield(*res[:2])
             # if it has fields return a recarray,
             # if it's a string return 'SU' return a chararray
@@ -142,8 +142,8 @@
         else:
             raise AttributeError, "'record' object has no "\
                   "attribute '%s'" % attr
-        
 
+
     def __setattr__(self, attr, val):
         if attr in ['setfield', 'getfield', 'dtype']:
             raise AttributeError, "Cannot set '%s' attribute" % attr;
@@ -171,7 +171,7 @@
     def __new__(subtype, shape, dtype=None, buf=None, offset=0, strides=None,
                 formats=None, names=None, titles=None,
                 byteorder=None, aligned=False):
-        
+
         if dtype is not None:
             descr = sb.dtype(dtype)
         else:
@@ -207,7 +207,7 @@
 # Save the dictionary
 #  If the attr is a field name and not in the saved dictionary
 #  Undo any "setting" of the attribute and do a setfield
-# Thus, you can't create attributes on-the-fly that are field names. 
+# Thus, you can't create attributes on-the-fly that are field names.
 
     def __setattr__(self, attr, val):
         newattr = attr not in self.__dict__
@@ -224,14 +224,14 @@
                 return ret
             if newattr:         # We just added this one
                 try:            #  or this setattr worked on an internal
-                                #  attribute. 
+                                #  attribute.
                     object.__delattr__(self, attr)
                 except:
                     return ret
         try:
             res = fielddict[attr][:2]
         except (TypeError,KeyError):
-            raise AttributeError, "record array has no attribute %s" % attr 
+            raise AttributeError, "record array has no attribute %s" % attr
         return self.setfield(val,*res)
 
     def __getitem__(self, indx):
@@ -268,8 +268,8 @@
         dtype = sb.dtype(obj)
         if dtype.fields is None:
             return self.__array__().view(dtype)
-        return ndarray.view(self, obj)            
-    
+        return ndarray.view(self, obj)
+
 def fromarrays(arrayList, dtype=None, shape=None, formats=None,
                names=None, titles=None, aligned=False, byteorder=None):
     """ create a record array from a (flat) list of arrays
@@ -284,9 +284,9 @@
     >>> r.a
     array([1, 2, 3, 4])
     """
-    
+
     arrayList = [sb.asarray(x) for x in arrayList]
-    
+
     if shape is None or shape == 0:
         shape = arrayList[0].shape
 
@@ -318,18 +318,18 @@
     if len(descr) != len(arrayList):
         raise ValueError, "mismatch between the number of fields "\
               "and the number of arrays"
-    
+
     d0 = descr[0].shape
     nn = len(d0)
     if nn > 0:
         shape = shape[:-nn]
-        
+
     for k, obj in enumerate(arrayList):
         nn = len(descr[k].shape)
         testshape = obj.shape[:len(obj.shape)-nn]
         if testshape != shape:
             raise ValueError, "array-shape mismatch in array %d" % k
-        
+
     _array = recarray(shape, descr)
 
     # populate the record array (makes a copy)
@@ -369,7 +369,7 @@
     (2, 'de', 1.3)
     ]
     """
-    
+
     nfields = len(recList[0])
     if formats is None and dtype is None:  # slower
         obj = sb.array(recList,dtype=object)
@@ -400,7 +400,7 @@
             retval.shape = shape
 
     res = retval.view(recarray)
-        
+
     res.dtype = sb.dtype((record, res.dtype))
     return res
 
@@ -409,8 +409,8 @@
                names=None, titles=None, aligned=False, byteorder=None):
     """ create a (read-only) record array from binary data contained in
     a string"""
-    
 
+
     if dtype is None and formats is None:
         raise ValueError, "Must have dtype= or formats="
 
@@ -418,11 +418,11 @@
         descr = sb.dtype(dtype)
     else:
         descr = format_parser(formats, names, titles, aligned, byteorder)._descr
-        
+
     itemsize = descr.itemsize
     if (shape is None or shape == 0 or shape == -1):
         shape = (len(datastring)-offset) / itemsize
-        
+
     _array = recarray(shape, descr, buf=datastring, offset=offset)
     return _array
 
@@ -465,7 +465,7 @@
     if (offset > 0):
         fd.seek(offset, 1)
     size = get_remaining_size(fd)
-    
+
     if dtype is not None:
         descr = sb.dtype(dtype)
     else:
@@ -520,7 +520,7 @@
                 'aligned' : aligned,
                 'byteorder' : byteorder
                 }
-        
+
     if obj is None:
         if shape is None:
             raise ValueError("Must define a shape if obj is None")

Modified: branches/splitcode/numpy/core/setup.py
===================================================================
--- branches/splitcode/numpy/core/setup.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/core/setup.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,10 +1,8 @@
-
 import imp
 import os
 import sys
 from os.path import join
-from glob import glob
-from distutils.dep_util import newer,newer_group
+from distutils.dep_util import newer
 
 FUNCTIONS_TO_CHECK = [
     ('expl', 'HAVE_LONGDOUBLE_FUNCS'),
@@ -54,7 +52,7 @@
                 #  which is done in error-handling
                 #  ufunc code.  NPY_ALLOW_C_API and friends
                 #  cause the segfault. So, we disable threading
-                #  for now. 
+                #  for now.
             if sys.version[:5] < '2.4.2':
                 nosmp = 1
             else:
@@ -100,7 +98,7 @@
 
             if sys.platform == 'win32':
                 moredefs.append('NPY_NO_SIGNAL')
-                
+
             if sys.version[:3] < '2.4':
                 if config_cmd.check_func('strtod', decl=False,
                                          headers=['stdlib.h']):

Modified: branches/splitcode/numpy/core/src/scalartypes.inc.src
===================================================================
--- branches/splitcode/numpy/core/src/scalartypes.inc.src	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/core/src/scalartypes.inc.src	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1764,7 +1764,7 @@
         robj = PyArray_Return((PyArrayObject *)arr);
 
  finish:
-        if (robj->ob_type == type) return robj;
+        if ((robj==NULL) || (robj->ob_type == type)) return robj;
         /* Need to allocate new type and copy data-area over */
         if (type->tp_itemsize) {
                 itemsize = PyString_GET_SIZE(robj);

Modified: branches/splitcode/numpy/core/src/ufuncobject.c
===================================================================
--- branches/splitcode/numpy/core/src/ufuncobject.c	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/core/src/ufuncobject.c	2007-01-09 18:24:53 UTC (rev 3509)
@@ -2132,7 +2132,7 @@
 		}
 		else {
 			loop->meth = NOBUFFER_UFUNCLOOP;
-			loop->steps[0] = (aar)->strides[axis];
+			loop->steps[1] = (aar)->strides[axis];
 			loop->N -= 1;
 		}
         }
@@ -2227,7 +2227,7 @@
         if (loop->ret == NULL) goto fail;
         loop->insize = aar->descr->elsize;
         loop->outsize = loop->ret->descr->elsize;
-        loop->bufptr[1] = loop->ret->data;
+        loop->bufptr[0] = loop->ret->data;
 
 	if (loop->meth == ZERO_EL_REDUCELOOP) {
 		loop->size = PyArray_SIZE(loop->ret);
@@ -2254,7 +2254,7 @@
         loop->size = loop->it->size;
 
 	if (operation == UFUNC_REDUCE) {
-		loop->steps[1] = 0;
+		loop->steps[0] = 0;
 	}
 	else {
 		loop->rit = (PyArrayIterObject *)			\
@@ -2270,17 +2270,17 @@
 		loop->rit->backstrides[axis] = 0;
 
 		if (operation == UFUNC_ACCUMULATE)
-			loop->steps[1] = loop->ret->strides[axis];
+			loop->steps[0] = loop->ret->strides[axis];
 		else
-			loop->steps[1] = 0;
+			loop->steps[0] = 0;
 	}
-	loop->steps[2] = loop->steps[1];
-	loop->bufptr[2] = loop->bufptr[1] + loop->steps[2];
+	loop->steps[2] = loop->steps[0];
+	loop->bufptr[2] = loop->bufptr[0] + loop->steps[2];
 
 
 	if (loop->meth == BUFFER_UFUNCLOOP) {
 		int _size;
-		loop->steps[0] = loop->outsize;
+		loop->steps[1] = loop->outsize;
                 if (otype != aar->descr->type_num) {
 			_size=loop->bufsize*(loop->outsize +		\
 					     aar->descr->elsize);
@@ -2289,7 +2289,7 @@
 			if (loop->obj) memset(loop->buffer, 0, _size);
                         loop->castbuf = loop->buffer + \
                                 loop->bufsize*aar->descr->elsize;
-                        loop->bufptr[0] = loop->castbuf;
+                        loop->bufptr[1] = loop->castbuf;
                         loop->cast = PyArray_GetCastFunc(aar->descr, otype);
 			if (loop->cast == NULL) goto fail;
                 }
@@ -2298,7 +2298,7 @@
                         loop->buffer = PyDataMem_NEW(_size);
                         if (loop->buffer == NULL) goto fail;
 			if (loop->obj) memset(loop->buffer, 0, _size);
-                        loop->bufptr[0] = loop->buffer;
+                        loop->bufptr[1] = loop->buffer;
                 }
 	}
 
@@ -2341,8 +2341,8 @@
 		/* fprintf(stderr, "ZERO..%d\n", loop->size); */
 		for(i=0; i<loop->size; i++) {
 			if (loop->obj) Py_INCREF(*((PyObject **)loop->idptr));
-			memmove(loop->bufptr[1], loop->idptr, loop->outsize);
-			loop->bufptr[1] += loop->outsize;
+			memmove(loop->bufptr[0], loop->idptr, loop->outsize);
+			loop->bufptr[0] += loop->outsize;
 		}
                 break;
         case ONE_EL_REDUCELOOP:
@@ -2350,10 +2350,10 @@
                 while(loop->index < loop->size) {
 			if (loop->obj)
 				Py_INCREF(*((PyObject **)loop->it->dataptr));
-                        memmove(loop->bufptr[1], loop->it->dataptr,
+                        memmove(loop->bufptr[0], loop->it->dataptr,
                                loop->outsize);
 			PyArray_ITER_NEXT(loop->it);
-			loop->bufptr[1] += loop->outsize;
+			loop->bufptr[0] += loop->outsize;
 			loop->index++;
 		}
 		break;
@@ -2363,18 +2363,18 @@
 			/* Copy first element to output */
 			if (loop->obj)
 				Py_INCREF(*((PyObject **)loop->it->dataptr));
-                        memmove(loop->bufptr[1], loop->it->dataptr,
+                        memmove(loop->bufptr[0], loop->it->dataptr,
                                loop->outsize);
 			/* Adjust input pointer */
-                        loop->bufptr[0] = loop->it->dataptr+loop->steps[0];
+                        loop->bufptr[1] = loop->it->dataptr+loop->steps[1];
                         loop->function((char **)loop->bufptr,
 				       &(loop->N),
                                        loop->steps, loop->funcdata);
 			UFUNC_CHECK_ERROR(loop);
 
                         PyArray_ITER_NEXT(loop->it)
-                        loop->bufptr[1] += loop->outsize;
-                        loop->bufptr[2] = loop->bufptr[1];
+                        loop->bufptr[0] += loop->outsize;
+                        loop->bufptr[2] = loop->bufptr[0];
                         loop->index++;
                 }
                 break;
@@ -2405,11 +2405,11 @@
 					   1, NULL, NULL);
 				if (loop->obj)
 					Py_INCREF(*((PyObject **)loop->castbuf));
-				memcpy(loop->bufptr[1], loop->castbuf,
+				memcpy(loop->bufptr[0], loop->castbuf,
 				       loop->outsize);
 			}
 			else { /* Simple copy */
-				arr->descr->f->copyswap(loop->bufptr[1],
+				arr->descr->f->copyswap(loop->bufptr[0],
 							loop->inptr,
 							loop->swap, NULL);
 			}
@@ -2435,13 +2435,13 @@
                                 loop->function((char **)loop->bufptr,
                                                &i,
 					       loop->steps, loop->funcdata);
-				loop->bufptr[1] += loop->steps[1]*i;
+				loop->bufptr[0] += loop->steps[0]*i;
 				loop->bufptr[2] += loop->steps[2]*i;
 				UFUNC_CHECK_ERROR(loop);
                         }
                         PyArray_ITER_NEXT(loop->it);
-                        loop->bufptr[1] += loop->outsize;
-                        loop->bufptr[2] = loop->bufptr[1];
+                        loop->bufptr[0] += loop->outsize;
+                        loop->bufptr[2] = loop->bufptr[0];
                         loop->index++;
                 }
         }
@@ -2485,8 +2485,8 @@
 		for(i=0; i<loop->size; i++) {
 			if (loop->obj)
 				Py_INCREF(*((PyObject **)loop->idptr));
-			memcpy(loop->bufptr[1], loop->idptr, loop->outsize);
-			loop->bufptr[1] += loop->outsize;
+			memcpy(loop->bufptr[0], loop->idptr, loop->outsize);
+			loop->bufptr[0] += loop->outsize;
 		}
                 break;
         case ONE_EL_REDUCELOOP: /* Accumulate */
@@ -2494,10 +2494,10 @@
                 while(loop->index < loop->size) {
 			if (loop->obj)
 				Py_INCREF(*((PyObject **)loop->it->dataptr));
-                        memcpy(loop->bufptr[1], loop->it->dataptr,
+                        memcpy(loop->bufptr[0], loop->it->dataptr,
                                loop->outsize);
 			PyArray_ITER_NEXT(loop->it);
-			loop->bufptr[1] += loop->outsize;
+			loop->bufptr[0] += loop->outsize;
 			loop->index++;
 		}
 		break;
@@ -2507,10 +2507,10 @@
 			/* Copy first element to output */
 			if (loop->obj)
 				Py_INCREF(*((PyObject **)loop->it->dataptr));
-                        memcpy(loop->bufptr[1], loop->it->dataptr,
+                        memcpy(loop->bufptr[0], loop->it->dataptr,
                                loop->outsize);
 			/* Adjust input pointer */
-                        loop->bufptr[0] = loop->it->dataptr+loop->steps[0];
+                        loop->bufptr[1] = loop->it->dataptr+loop->steps[1];
                         loop->function((char **)loop->bufptr,
 				       &(loop->N),
                                        loop->steps, loop->funcdata);
@@ -2518,8 +2518,8 @@
 
                         PyArray_ITER_NEXT(loop->it);
 			PyArray_ITER_NEXT(loop->rit);
-                        loop->bufptr[1] = loop->rit->dataptr;
-			loop->bufptr[2] = loop->bufptr[1] + loop->steps[1];
+                        loop->bufptr[0] = loop->rit->dataptr;
+			loop->bufptr[2] = loop->bufptr[0] + loop->steps[0];
                         loop->index++;
                 }
                 break;
@@ -2550,11 +2550,11 @@
 					   1, NULL, NULL);
 				if (loop->obj)
 					Py_INCREF(*((PyObject **)loop->castbuf));
-				memcpy(loop->bufptr[1], loop->castbuf,
+				memcpy(loop->bufptr[0], loop->castbuf,
 				       loop->outsize);
 			}
 			else { /* Simple copy */
-				arr->descr->f->copyswap(loop->bufptr[1],
+				arr->descr->f->copyswap(loop->bufptr[0],
 							loop->inptr,
 							loop->swap,
 							NULL);
@@ -2581,14 +2581,14 @@
                                 loop->function((char **)loop->bufptr,
                                                &i,
 					       loop->steps, loop->funcdata);
-				loop->bufptr[1] += loop->steps[1]*i;
+				loop->bufptr[0] += loop->steps[0]*i;
 				loop->bufptr[2] += loop->steps[2]*i;
 				UFUNC_CHECK_ERROR(loop);
                         }
                         PyArray_ITER_NEXT(loop->it);
 			PyArray_ITER_NEXT(loop->rit);
-                        loop->bufptr[1] = loop->rit->dataptr;
-			loop->bufptr[2] = loop->bufptr[1] + loop->steps[1];
+                        loop->bufptr[0] = loop->rit->dataptr;
+			loop->bufptr[2] = loop->bufptr[0] + loop->steps[0];
                         loop->index++;
                 }
         }
@@ -2669,28 +2669,28 @@
 		while(loop->index < loop->size) {
 			ptr = (intp *)ind->data;
 			for (i=0; i<nn; i++) {
-				loop->bufptr[0] = loop->it->dataptr +	\
+				loop->bufptr[1] = loop->it->dataptr +	\
 					(*ptr)*loop->instrides;
 				if (loop->obj)
-					Py_INCREF(*((PyObject **)loop->bufptr[0]));
-				memcpy(loop->bufptr[1], loop->bufptr[0],
+					Py_INCREF(*((PyObject **)loop->bufptr[1]));
+				memcpy(loop->bufptr[0], loop->bufptr[1],
 				       loop->outsize);
 				mm = (i==nn-1 ? arr->dimensions[axis]-*ptr : \
 				      *(ptr+1) - *ptr) - 1;
 				if (mm > 0) {
-					loop->bufptr[0] += loop->instrides;
-					loop->bufptr[2] = loop->bufptr[1];
+					loop->bufptr[1] += loop->instrides;
+					loop->bufptr[2] = loop->bufptr[0];
 					loop->function((char **)loop->bufptr,
 						       &mm, loop->steps,
 						       loop->funcdata);
 					UFUNC_CHECK_ERROR(loop);
 				}
-				loop->bufptr[1] += loop->ret->strides[axis];
+				loop->bufptr[0] += loop->ret->strides[axis];
 				ptr++;
 			}
 			PyArray_ITER_NEXT(loop->it);
 			PyArray_ITER_NEXT(loop->rit);
-			loop->bufptr[1] = loop->rit->dataptr;
+			loop->bufptr[0] = loop->rit->dataptr;
 			loop->index++;
 		}
 		break;
@@ -2703,7 +2703,7 @@
 			for (i=0; i<nn; i++) {
 				if (loop->obj)
 					Py_INCREF(*((PyObject **)loop->idptr));
-				memcpy(loop->bufptr[1], loop->idptr,
+				memcpy(loop->bufptr[0], loop->idptr,
 				       loop->outsize);
 				n = 0;
 				mm = (i==nn-1 ? arr->dimensions[axis] - *ptr :\
@@ -2728,19 +2728,19 @@
 						loop->cast(loop->buffer,
 							   loop->castbuf,
 							   j, NULL, NULL);
-					loop->bufptr[2] = loop->bufptr[1];
+					loop->bufptr[2] = loop->bufptr[0];
 					loop->function((char **)loop->bufptr,
 						       &j, loop->steps,
 						       loop->funcdata);
 					UFUNC_CHECK_ERROR(loop);
-					loop->bufptr[1] += j*loop->steps[1];
+					loop->bufptr[0] += j*loop->steps[0];
 				}
-				loop->bufptr[1] += loop->ret->strides[axis];
+				loop->bufptr[0] += loop->ret->strides[axis];
 				ptr++;
 			}
 			PyArray_ITER_NEXT(loop->it);
 			PyArray_ITER_NEXT(loop->rit);
-			loop->bufptr[1] = loop->rit->dataptr;
+			loop->bufptr[0] = loop->rit->dataptr;
 			loop->index++;
 		}
 		break;

Modified: branches/splitcode/numpy/core/tests/test_defmatrix.py
===================================================================
--- branches/splitcode/numpy/core/tests/test_defmatrix.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/core/tests/test_defmatrix.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -177,8 +177,8 @@
         y = zeros((3,1),float)
         y[:,0] = [0.8,0.2,0.3]
         x[:,1] = y>0.5
-        assert_equal(x, [[0,1],[0,0],[0,0]])    
-        
+        assert_equal(x, [[0,1],[0,0],[0,0]])
 
+
 if __name__ == "__main__":
     NumpyTest().run()

Modified: branches/splitcode/numpy/core/tests/test_errstate.py
===================================================================
--- branches/splitcode/numpy/core/tests/test_errstate.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/core/tests/test_errstate.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 # The following exec statement (or something like it) is needed to
 # prevent SyntaxError on Python < 2.5. Even though this is a test,
 # SyntaxErrors are not acceptable; on Debian systems, they block
@@ -17,7 +16,7 @@
 
 class test_errstate(NumpyTestCase):
 
-    
+
     def test_invalid(self):
         with errstate(all='raise', under='ignore'):
             a = -arange(3)
@@ -31,7 +30,7 @@
                 pass
             else:
                 self.fail()
-                
+
     def test_divide(self):
         with errstate(all='raise', under='ignore'):
             a = -arange(3)
@@ -45,7 +44,7 @@
                 pass
             else:
                 self.fail()
-                
+
     def test_errcall(self):
         def foo(*args):
             print args

Modified: branches/splitcode/numpy/core/tests/test_ma.py
===================================================================
--- branches/splitcode/numpy/core/tests/test_ma.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/core/tests/test_ma.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -715,32 +715,32 @@
 
 
 class test_array_methods(NumpyTestCase):
-        
+
     def setUp(self):
-        x = numpy.array([ 8.375,  7.545,  8.828,  8.5  ,  1.757,  5.928,  
-                          8.43 ,  7.78 ,  9.865,  5.878,  8.979,  4.732,  
-                          3.012,  6.022,  5.095,  3.116,  5.238,  3.957,  
+        x = numpy.array([ 8.375,  7.545,  8.828,  8.5  ,  1.757,  5.928,
+                          8.43 ,  7.78 ,  9.865,  5.878,  8.979,  4.732,
+                          3.012,  6.022,  5.095,  3.116,  5.238,  3.957,
                           6.04 ,  9.63 ,  7.712,  3.382,  4.489,  6.479,
-                          7.189,  9.645,  5.395,  4.961,  9.894,  2.893,  
+                          7.189,  9.645,  5.395,  4.961,  9.894,  2.893,
                           7.357,  9.828,  6.272,  3.758,  6.693,  0.993])
         X = x.reshape(6,6)
         XX = x.reshape(3,2,2,3)
-    
-        m = numpy.array([0, 1, 0, 1, 0, 0, 
-                         1, 0, 1, 1, 0, 1, 
-                         0, 0, 0, 1, 0, 1, 
-                         0, 0, 0, 1, 1, 1, 
-                         1, 0, 0, 1, 0, 0, 
+
+        m = numpy.array([0, 1, 0, 1, 0, 0,
+                         1, 0, 1, 1, 0, 1,
+                         0, 0, 0, 1, 0, 1,
+                         0, 0, 0, 1, 1, 1,
+                         1, 0, 0, 1, 0, 0,
                          0, 0, 1, 0, 1, 0])
         mx = array(data=x,mask=m)
         mX = array(data=X,mask=m.reshape(X.shape))
         mXX = array(data=XX,mask=m.reshape(XX.shape))
-    
-        m2 = numpy.array([1, 1, 0, 1, 0, 0, 
-                          1, 1, 1, 1, 0, 1, 
-                          0, 0, 1, 1, 0, 1, 
-                          0, 0, 0, 1, 1, 1, 
-                          1, 0, 0, 1, 1, 0, 
+
+        m2 = numpy.array([1, 1, 0, 1, 0, 0,
+                          1, 1, 1, 1, 0, 1,
+                          0, 0, 1, 1, 0, 1,
+                          0, 0, 0, 1, 1, 1,
+                          1, 0, 0, 1, 1, 0,
                           0, 0, 1, 0, 1, 1])
         m2x = array(data=x,mask=m2)
         m2X = array(data=X,mask=m2.reshape(X.shape))
@@ -789,14 +789,14 @@
         self.failUnless(eq(mXcp.data,mX.filled(1).cumprod(0)))
         mXcp = mX.cumprod(1)
         self.failUnless(eq(mXcp.data,mX.filled(1).cumprod(1)))
-                           
+
     def test_cumsum(self):
         (x,X,XX,m,mx,mX,mXX,) = self.d
         mXcp = mX.cumsum(0)
         self.failUnless(eq(mXcp.data,mX.filled(0).cumsum(0)))
         mXcp = mX.cumsum(1)
         self.failUnless(eq(mXcp.data,mX.filled(0).cumsum(1)))
-                           
+
     def test_varstd(self):
         (x,X,XX,m,mx,mX,mXX,) = self.d
         self.failUnless(eq(mX.var(axis=None),mX.compressed().var()))
@@ -809,8 +809,8 @@
             self.failUnless(eq(mXvar0[k],mX[:,k].compressed().var()))
             self.failUnless(eq(numpy.sqrt(mXvar0[k]),
                                mX[:,k].compressed().std()))
-        
 
+
 def eqmask(m1, m2):
     if m1 is nomask:
         return m2 is nomask

Modified: branches/splitcode/numpy/core/tests/test_multiarray.py
===================================================================
--- branches/splitcode/numpy/core/tests/test_multiarray.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/core/tests/test_multiarray.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 from numpy.testing import *
 from numpy.core import *
 from numpy import random
@@ -196,7 +195,7 @@
     def check_output(self):
         x = array(2)
         self.failUnlessRaises(ValueError, add, x, [1], x)
-        
+
 class test_creation(NumpyTestCase):
     def check_from_attribute(self):
         class x(object):
@@ -283,23 +282,23 @@
         p = loads(s)
         assert_equal(a, p)
 
-class test_fancy_indexing(NumpyTestCase): 
-    def check_list(self): 
-        x = ones((1,1)) 
-        x[:,[0]] = 2.0 
-        assert_array_equal(x, array([[2.0]])) 
+class test_fancy_indexing(NumpyTestCase):
+    def check_list(self):
+        x = ones((1,1))
+        x[:,[0]] = 2.0
+        assert_array_equal(x, array([[2.0]]))
 
-        x = ones((1,1,1)) 
-        x[:,:,[0]] = 2.0 
-        assert_array_equal(x, array([[[2.0]]])) 
+        x = ones((1,1,1))
+        x[:,:,[0]] = 2.0
+        assert_array_equal(x, array([[[2.0]]]))
 
-    def check_tuple(self): 
-        x = ones((1,1)) 
-        x[:,(0,)] = 2.0 
-        assert_array_equal(x, array([[2.0]])) 
-        x = ones((1,1,1)) 
-        x[:,:,(0,)] = 2.0 
-        assert_array_equal(x, array([[[2.0]]])) 
+    def check_tuple(self):
+        x = ones((1,1))
+        x[:,(0,)] = 2.0
+        assert_array_equal(x, array([[2.0]]))
+        x = ones((1,1,1))
+        x[:,:,(0,)] = 2.0
+        assert_array_equal(x, array([[[2.0]]]))
 
 class test_string_compare(NumpyTestCase):
     def check_string(self):
@@ -309,8 +308,8 @@
         assert_array_equal(g1 != g2, [g1[i] != g2[i] for i in [0,1,2]])
         assert_array_equal(g1 <= g2, [g1[i] <= g2[i] for i in [0,1,2]])
         assert_array_equal(g1 >= g2, [g1[i] >= g2[i] for i in [0,1,2]])
-        assert_array_equal(g1 < g2, [g1[i] < g2[i] for i in [0,1,2]]) 
-        assert_array_equal(g1 > g2, [g1[i] > g2[i] for i in [0,1,2]]) 
+        assert_array_equal(g1 < g2, [g1[i] < g2[i] for i in [0,1,2]])
+        assert_array_equal(g1 > g2, [g1[i] > g2[i] for i in [0,1,2]])
 
     def check_mixed(self):
         g1 = array(["spam","spa","spammer","and eggs"])
@@ -321,8 +320,8 @@
         assert_array_equal(g1 > g2, [x > g2 for x in g1])
         assert_array_equal(g1 <= g2, [x <= g2 for x in g1])
         assert_array_equal(g1 >= g2, [x >= g2 for x in g1])
-        
 
+
     def check_unicode(self):
         g1 = array([u"This",u"is",u"example"])
         g2 = array([u"This",u"was",u"example"])
@@ -330,8 +329,8 @@
         assert_array_equal(g1 != g2, [g1[i] != g2[i] for i in [0,1,2]])
         assert_array_equal(g1 <= g2, [g1[i] <= g2[i] for i in [0,1,2]])
         assert_array_equal(g1 >= g2, [g1[i] >= g2[i] for i in [0,1,2]])
-        assert_array_equal(g1 < g2,  [g1[i] < g2[i] for i in [0,1,2]]) 
-        assert_array_equal(g1 > g2,  [g1[i] > g2[i] for i in [0,1,2]]) 
+        assert_array_equal(g1 < g2,  [g1[i] < g2[i] for i in [0,1,2]])
+        assert_array_equal(g1 > g2,  [g1[i] > g2[i] for i in [0,1,2]])
 
 
 class test_argmax(NumpyTestCase):
@@ -339,10 +338,10 @@
         a = random.normal(0,1,(4,5,6,7,8))
         for i in xrange(a.ndim):
             amax = a.max(i)
-            aargmax = a.argmax(i)  
+            aargmax = a.argmax(i)
             axes = range(a.ndim)
             axes.remove(i)
-            assert all(amax == aargmax.choose(*a.transpose(i,*axes)))        
+            assert all(amax == aargmax.choose(*a.transpose(i,*axes)))
 
 class test_newaxis(NumpyTestCase):
     def check_basic(self):

Modified: branches/splitcode/numpy/core/tests/test_numeric.py
===================================================================
--- branches/splitcode/numpy/core/tests/test_numeric.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/core/tests/test_numeric.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -8,7 +8,7 @@
     def __init__(self,sequence=None):
         if sequence is None:
             sequence=[]
-        self.array=array(sequence)    
+        self.array=array(sequence)
     def __add__(self,other):
         out=Vec()
         out.array=self.array+other.array
@@ -118,7 +118,7 @@
         b2 = rand(1,1)
         c1 = dot(b1,b2)
         c2 = dot_(b1,b2)
-        assert_almost_equal(c1, c2, decimal=self.N)        
+        assert_almost_equal(c1, c2, decimal=self.N)
 
     def check_all(self):
         dims = [(),(1,),(1,1)]
@@ -196,14 +196,14 @@
             self.fail()
         seterr(divide='ignore')
         array([1.]) / array([0.])
-        
-        
+
+
 class test_fromiter(NumpyTestCase):
-    
+
     def makegen(self):
         for x in xrange(24):
             yield x**2
-            
+
     def test_types(self):
         ai32 = fromiter(self.makegen(), int32)
         ai64 = fromiter(self.makegen(), int64)
@@ -247,7 +247,7 @@
 
     def test_large(self):
         assert_equal(binary_repr(10736848),'101000111101010011010000')
-        
+
 import sys
 if sys.version_info[:2] >= (2, 5):
     set_local_path()

Modified: branches/splitcode/numpy/core/tests/test_numerictypes.py
===================================================================
--- branches/splitcode/numpy/core/tests/test_numerictypes.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/core/tests/test_numerictypes.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -50,7 +50,7 @@
         ('z2', 'b1')]),
     ('color', 'S2'),
     ('info', [
-        ('Name', 'U8'),  
+        ('Name', 'U8'),
         ('Value', 'c16')]),
     ('y', 'f8', (2, 2)),
     ('z', 'u1')]
@@ -333,7 +333,7 @@
 
 class test_empty_field(NumpyTestCase):
     def check_assign(self):
-        a = numpy.arange(10, dtype=numpy.float32)    
+        a = numpy.arange(10, dtype=numpy.float32)
         a.dtype = [("int",   "<0i4"),("float", "<2f4")]
         assert(a['int'].shape == (5,0))
         assert(a['float'].shape == (5,2))

Modified: branches/splitcode/numpy/core/tests/test_regression.py
===================================================================
--- branches/splitcode/numpy/core/tests/test_regression.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/core/tests/test_regression.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -602,5 +602,16 @@
         ca = N.char.array(['Hi','There'])
         assert_equal(ca.startswith('H'),[True,False])
 
+    def check_noncommutative_reduce_accumulate(self, level=rlevel):
+        """Ticket #413"""
+        tosubtract = N.arange(5)
+        todivide = N.array([2.0, 0.5, 0.25])
+        assert_equal(N.subtract.reduce(tosubtract), -10)
+        assert_equal(N.divide.reduce(todivide), 16.0)
+        assert_array_equal(N.subtract.accumulate(tosubtract), 
+            N.array([0, -1, -3, -6, -10]))
+        assert_array_equal(N.divide.accumulate(todivide),
+            N.array([2., 4., 16.]))
+
 if __name__ == "__main__":
     NumpyTest().run()

Modified: branches/splitcode/numpy/core/tests/test_scalarmath.py
===================================================================
--- branches/splitcode/numpy/core/tests/test_scalarmath.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/core/tests/test_scalarmath.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 from numpy.testing import *
 set_package_path()
 import numpy.core.umath as ncu
@@ -11,7 +10,7 @@
          N.single, N.double, N.longdouble, N.csingle,
          N.cdouble, N.clongdouble]
 
-# This compares scalarmath against ufuncs. 
+# This compares scalarmath against ufuncs.
 
 class test_types(NumpyTestCase):
     def check_types(self, level=1):

Modified: branches/splitcode/numpy/core/tests/test_umath.py
===================================================================
--- branches/splitcode/numpy/core/tests/test_umath.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/core/tests/test_umath.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 from numpy.testing import *
 set_package_path()
 from numpy.core.umath import minimum, maximum, exp
@@ -167,7 +166,7 @@
     def setUp(self):
         self.x = 0.52
         self.z = self.x+0j
-        self.funcs = ['arcsin', 'arccos', 'arctan', 'arcsinh', 'arccosh', 
+        self.funcs = ['arcsin', 'arccos', 'arctan', 'arcsinh', 'arccosh',
                       'arctanh', 'sin', 'cos', 'tan', 'exp', 'log', 'sqrt',
                       'log10']
     def test_it(self):

Modified: branches/splitcode/numpy/ctypeslib.py
===================================================================
--- branches/splitcode/numpy/ctypeslib.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/ctypeslib.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -2,7 +2,7 @@
            'c_intp']
 
 import sys, os
-from numpy import integer, product, ndarray, dtype as _dtype, deprecate
+from numpy import integer, ndarray, dtype as _dtype, deprecate
 from numpy.core.multiarray import _flagdict, flagsobj
 
 try:

Modified: branches/splitcode/numpy/distutils/ccompiler.py
===================================================================
--- branches/splitcode/numpy/distutils/ccompiler.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/distutils/ccompiler.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -192,7 +192,7 @@
         # not valid for C++ code, only for C.  Remove it if it's there to
         # avoid a spurious warning on every compilation.  All the default
         # options used by distutils can be extracted with:
-        
+
         # from distutils import sysconfig
         # sysconfig.get_config_vars('CC', 'CXX', 'OPT', 'BASECFLAGS',
         # 'CCSHARED', 'LDSHARED', 'SO')
@@ -200,7 +200,7 @@
             self.compiler_so.remove('-Wstrict-prototypes')
         except (AttributeError, ValueError):
             pass
-        
+
         if hasattr(self,'compiler') and self.compiler[0].find('cc')>=0:
             if not self.compiler_cxx:
                 if self.compiler[0][:3] == 'gcc':

Modified: branches/splitcode/numpy/distutils/command/build_clib.py
===================================================================
--- branches/splitcode/numpy/distutils/command/build_clib.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/distutils/command/build_clib.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -110,7 +110,7 @@
             sources = list(sources)
 
 
-            
+
             lib_file = compiler.library_filename(lib_name,
                                                  output_dir=self.build_clib)
 
@@ -135,7 +135,7 @@
                                           force=self.force,
                                           requiref90=requiref90)
                 fcompiler.customize(config_fc)
-            
+
             macros = build_info.get('macros')
             include_dirs = build_info.get('include_dirs')
             extra_postargs = build_info.get('extra_compiler_args') or []

Modified: branches/splitcode/numpy/distutils/command/config_compiler.py
===================================================================
--- branches/splitcode/numpy/distutils/command/config_compiler.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/distutils/command/config_compiler.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 import sys
 from distutils.core import Command
 
@@ -9,7 +8,7 @@
     # Using cache to prevent infinite recursion
     if _cache: return
     _cache.append(1)
-    
+
     from numpy.distutils.fcompiler import show_fcompilers
     import distutils.core
     dist = distutils.core._setup_distribution

Modified: branches/splitcode/numpy/distutils/fcompiler/g95.py
===================================================================
--- branches/splitcode/numpy/distutils/fcompiler/g95.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/distutils/fcompiler/g95.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -16,8 +16,8 @@
     version_pattern = r'G95 \((GCC (?P<gccversion>[\d.]+)|.*?) \(g95 (?P<version>.*)!\) (?P<date>.*)\).*'
     # $ g95 --version
     # G95 (GCC 4.0.3 (g95 0.90!) Aug 22 2006)
-   
 
+
     executables = {
         'version_cmd'  : ["g95", "--version"],
         'compiler_f77' : ["g95", "-ffixed-form"],

Modified: branches/splitcode/numpy/distutils/fcompiler/gnu.py
===================================================================
--- branches/splitcode/numpy/distutils/fcompiler/gnu.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/distutils/fcompiler/gnu.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 import re
 import os
 import sys
@@ -275,7 +274,7 @@
     def get_libraries(self):
         opt = GnuFCompiler.get_libraries(self)
         if sys.platform == 'darwin':
-            opt.remove('cc_dynamic')        
+            opt.remove('cc_dynamic')
         return opt
 
 if __name__ == '__main__':

Modified: branches/splitcode/numpy/distutils/interactive.py
===================================================================
--- branches/splitcode/numpy/distutils/interactive.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/distutils/interactive.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 import os
 import sys
 from pprint import pformat
@@ -12,7 +11,7 @@
     for a in ['name']:
         print 'os.%s = %s' % (a,pformat(getattr(os,a)))
     if hasattr(os,'uname'):
-        print 'system,node,release,version,machine = ',os.uname()    
+        print 'system,node,release,version,machine = ',os.uname()
 
 def show_environ(*args):
     for k,i in os.environ.items():
@@ -29,7 +28,7 @@
 def show_tasks(argv,ccompiler,fcompiler):
     print """\
 
-Tasks: 
+Tasks:
   i       - Show python/platform/machine information
   ie      - Show environment information
   c       - Show C compilers information
@@ -65,7 +64,7 @@
     if s:
         argv[1:] = splitcmdline(s)
     return
-    
+
 def interactive_sys_argv(argv):
     print '='*72
     print 'Starting interactive session'
@@ -186,4 +185,3 @@
 
     print '-'*72
     return argv
-

Modified: branches/splitcode/numpy/distutils/misc_util.py
===================================================================
--- branches/splitcode/numpy/distutils/misc_util.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/distutils/misc_util.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -972,9 +972,9 @@
         return
 
     def add_numarray_include_dirs(self):
-	import numpy.numarray.util as nnu
-	self.add_include_dirs(*nnu.get_numarray_include_dirs())
-	
+        import numpy.numarray.util as nnu
+        self.add_include_dirs(*nnu.get_numarray_include_dirs())
+
     def add_headers(self,*files):
         """ Add installable headers to configuration.
         Argument(s) can be either

Modified: branches/splitcode/numpy/distutils/system_info.py
===================================================================
--- branches/splitcode/numpy/distutils/system_info.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/distutils/system_info.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1114,7 +1114,7 @@
     if _cached_atlas_version.has_key(key):
         return _cached_atlas_version[key]
     c = cmd_config(Distribution())
-    atlas_version = None  
+    atlas_version = None
     try:
         s, o = c.get_output(atlas_version_c_text,
                             libraries=libraries, library_dirs=library_dirs)

Modified: branches/splitcode/numpy/f2py/auxfuncs.py
===================================================================
--- branches/splitcode/numpy/f2py/auxfuncs.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/auxfuncs.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -228,7 +228,6 @@
 def containsmodule(block):
     if ismodule(block): return 1
     if not hasbody(block): return 0
-    ret = []
     for b in block['body']:
         if containsmodule(b): return 1
     return 0

Modified: branches/splitcode/numpy/f2py/capi_maps.py
===================================================================
--- branches/splitcode/numpy/f2py/capi_maps.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/capi_maps.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -85,7 +85,7 @@
             'complex_long_double':'PyArray_CDOUBLE',
             'string':'PyArray_CHAR', # f2py 2e is not ready for PyArray_STRING (must set itemisize etc)
             #'string':'PyArray_STRING'
-                
+
                 }
 c2pycode_map={'double':'d',
               'float':'f',

Modified: branches/splitcode/numpy/f2py/f2py_testing.py
===================================================================
--- branches/splitcode/numpy/f2py/f2py_testing.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/f2py_testing.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 import os,sys,re,time
 
 def cmdline():

Modified: branches/splitcode/numpy/f2py/lib/main.py
===================================================================
--- branches/splitcode/numpy/f2py/lib/main.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/lib/main.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -159,7 +159,7 @@
 
 def parse_files(sys_argv):
     flag = 'file'
-    file_names = [] 
+    file_names = []
     only_names = []
     skip_names = []
     options = []
@@ -206,7 +206,7 @@
         output_stream = open(signature_output,'w')
 
     flag = 'file'
-    file_names = [] 
+    file_names = []
     only_names = []
     skip_names = []
     options = []
@@ -245,7 +245,7 @@
             output_stream.write(block.topyf('    ')+'\n')
     output_stream.write('  END INTERFACE\n')
     output_stream.write('END PYTHON MODULE %s\n' % (modulename))
-    
+
     if signature_output not in ['stdout','stderr']:
         output_stream.close()
     return

Modified: branches/splitcode/numpy/f2py/lib/parser/Fortran2003.py
===================================================================
--- branches/splitcode/numpy/f2py/lib/parser/Fortran2003.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/lib/parser/Fortran2003.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -254,7 +254,7 @@
     def torepr(self): return '%s(%r, %r)' % (self.__class__.__name__, self.separator, self.items)
     def compare(self, other):
         return cmp((self.separator,self.items),(other.separator,self.items))
-    
+
 class UnaryOpBase(Base):
     """
     <unary-op-base> = <unary-op> <rhs>
@@ -265,7 +265,7 @@
         m = op_pattern.match(string)
         if not m: return
         #if not m: return rhs_cls(string)
-        rhs = string[m.end():].lstrip()        
+        rhs = string[m.end():].lstrip()
         if not rhs: return
         op = string[:m.end()].rstrip().upper()
         return op, rhs_cls(rhs)
@@ -779,8 +779,8 @@
 class Executable_Construct_C201(Base):
     subclass_names = Executable_Construct.subclass_names[:]
     subclass_names[subclass_names.index('Action_Stmt')] = 'Action_Stmt_C201'
-    
 
+
 class Action_Stmt(Base):# R214
     """
     <action-stmt> = <allocate-stmt>
@@ -966,7 +966,7 @@
     """
     subclass_names = []
     use_names = ['Kind_Selector','Char_Selector']
-        
+
     def match(string):
         for w,cls in [('INTEGER',Kind_Selector),
                       ('REAL',Kind_Selector),
@@ -1243,7 +1243,7 @@
     """
     subclass_names = []
     def match(string):
-        return NumberBase.match(pattern.abs_logical_literal_constant_named, string)    
+        return NumberBase.match(pattern.abs_logical_literal_constant_named, string)
     match = staticmethod(match)
 
 class Derived_Type_Def(Base): # R429
@@ -1394,7 +1394,7 @@
         if not lhs or not rhs: return
         return Type_Param_Name(lhs),'=',Scalar_Int_Initialization_Expr(rhs)
     match = staticmethod(match)
-    
+
 class Type_Param_Attr_Spec(STRINGBase): # R437
     """
     <type-param-attr-spec> = KIND
@@ -1814,7 +1814,7 @@
     <ac-implied-do> = ( <ac-value-list> , <ac-implied-do-control> )
     """
     subclass_names = []
-    use_names = ['Ac_Value_List','Ac_Implied_Do_Control']    
+    use_names = ['Ac_Value_List','Ac_Implied_Do_Control']
     def match(string):
         if string[0]+string[-1] != '()': return
         line, repmap = string_replace_map(string[1:-1].strip())
@@ -1830,7 +1830,7 @@
 
 class Ac_Implied_Do_Control(Base): # R471
     """
-    <ac-implied-do-control> = <ac-do-variable> = <scalar-int-expr> , <scalar-int-expr> [ , <scalar-int-expr> ]    
+    <ac-implied-do-control> = <ac-do-variable> = <scalar-int-expr> , <scalar-int-expr> [ , <scalar-int-expr> ]
     """
     subclass_names = []
     use_names = ['Ac_Do_Variable','Scalar_Int_Expr']
@@ -1849,7 +1849,7 @@
 class Ac_Do_Variable(Base): # R472
     """
     <ac-do-variable> = <scalar-int-variable>
-    <ac-do-variable> shall be a named variable    
+    <ac-do-variable> shall be a named variable
     """
     subclass_names = ['Scalar_Int_Variable']
 
@@ -2021,7 +2021,7 @@
         if self.items[3] is not None:
             s += ' ' + str(self.items[3])
         return s
-    
+
 class Object_Name(Base): # R505
     """
     <object-name> = <name>
@@ -2031,7 +2031,7 @@
 class Initialization(Base): # R506
     """
     <initialization> =  = <initialization-expr>
-                       | => <null-init> 
+                       | => <null-init>
     """
     subclass_names = []
     use_names = ['Initialization_Expr', 'Null_Init']
@@ -2122,7 +2122,7 @@
     def tostr(self):
         if self.items[0] is None: return str(self.items[1])
         return SeparatorBase.tostr(self)
-    
+
 class Lower_Bound(Base): # R512
     """
     <lower-bound> = <specification-expr>
@@ -2182,7 +2182,7 @@
             s += str(self.items[1]) + ' : '
         s += '*'
         return s
-    
+
 class Intent_Spec(STRINGBase): # R517
     """
     <intent-spec> = IN
@@ -2218,7 +2218,7 @@
     use_names = ['Deferred_Shape_Spec_List']
     def match(string): return CallBase.match(Object_Name, Deferred_Shape_Spec_List, string, require_rhs=True)
     match = staticmethod(match)
-    
+
 class Allocatable_Stmt(StmtBase, WORDClsBase): # R520
     """
     <allocateble-stmt> = ALLOCATABLE [ :: ] <object-name> [ ( <deferred-shape-spec-list> ) ] [ , <object-name> [ ( <deferred-shape-spec-list> ) ] ]...
@@ -2229,7 +2229,7 @@
         return WORDClsBase.match('ALLOCATABLE', Object_Name_Deferred_Shape_Spec_List_Item_List, string,
                                  check_colons=True, require_cls=True)
     match = staticmethod(match)
-    
+
 class Asynchronous_Stmt(StmtBase, WORDClsBase): # R521
     """
     <asynchronous-stmt> = ASYNCHRONOUS [ :: ] <object-name-list>
@@ -2331,7 +2331,7 @@
         return Data_Stmt_Repeat(lhs), Data_Stmt_Constant(rhs)
     match = staticmethod(match)
     def tostr(self):
-        return '%s * %s' % self.items    
+        return '%s * %s' % self.items
 
 class Data_Stmt_Repeat(Base): # R531
     """
@@ -2420,7 +2420,7 @@
     def match(string): return WORDClsBase.match('OPTIONAL',Dummy_Arg_Name_List,string,check_colons=True, require_cls=True)
     match = staticmethod(match)
     tostr = WORDClsBase.tostr_a
-    
+
 class Parameter_Stmt(StmtBase, CALLBase): # R538
     """
     <parameter-stmt> = PARAMETER ( <named-constant-def-list> )
@@ -2438,7 +2438,7 @@
     use_names = ['Named_Constant', 'Initialization_Expr']
     def match(string): return KeywordValueBase.match(Named_Constant, Initialization_Expr, string)
     match = staticmethod(match)
-    
+
 class Pointer_Stmt(StmtBase, WORDClsBase): # R540
     """
     <pointer-stmt> = POINTER [ :: ] <pointer-decl-list>
@@ -2448,7 +2448,7 @@
     def match(string): return WORDClsBase.match('POINTER',Pointer_Decl_List,string,check_colons=True, require_cls=True)
     match = staticmethod(match)
     tostr = WORDClsBase.tostr_a
-    
+
 class Pointer_Decl(CallBase): # R541
     """
     <pointer-decl> = <object-name> [ ( <deferred-shape-spec-list> ) ]
@@ -2522,7 +2522,7 @@
     def match(string): return WORDClsBase.match('VOLATILE',Object_Name_List,string,check_colons=True, require_cls=True)
     match = staticmethod(match)
     tostr = WORDClsBase.tostr_a
-    
+
 class Implicit_Stmt(StmtBase, WORDClsBase): # R549
     """
     <implicit-stmt> = IMPLICIT <implicit-spec-list>
@@ -2783,7 +2783,7 @@
     <parent-string> = <scalar-variable-name>
                       | <array-element>
                       | <scalar-structure-component>
-                      | <scalar-constant>    
+                      | <scalar-constant>
     """
     subclass_names = ['Scalar_Variable_Name', 'Array_Element', 'Scalar_Structure_Component', 'Scalar_Constant']
 
@@ -2915,7 +2915,7 @@
     """
     subclass_names = []
     use_names = ['Type_Spec', 'Allocation_List', 'Alloc_Opt_List']
-    
+
 class Alloc_Opt(KeywordValueBase):# R624
     """
     <alloc-opt> = STAT = <stat-variable>
@@ -2966,7 +2966,7 @@
     def match(string):
         return CallBase.match(Allocate_Object, Allocate_Shape_Spec_List, string, require_rhs = True)
     match = staticmethod(match)
-    
+
 class Allocate_Object(Base): # R629
     """
     <allocate-object> = <variable-name>
@@ -3015,7 +3015,7 @@
     use_names = ['Pointer_Object_List']
     def match(string): return CALLBase.match('NULLIFY', Pointer_Object_List, string, require_rhs=True)
     match = staticmethod(match)
-    
+
 class Pointer_Object(Base): # R634
     """
     <pointer-object> = <variable-name>
@@ -3070,7 +3070,7 @@
     """
     subclass_names = ['Constant', 'Parenthesis', 'Designator','Array_Constructor',
                       'Structure_Constructor',
-                      'Function_Reference', 'Type_Param_Inquiry', 'Type_Param_Name', 
+                      'Function_Reference', 'Type_Param_Inquiry', 'Type_Param_Name',
                        ]
 
 class Parenthesis(BracketBase): # R701.h
@@ -3098,14 +3098,14 @@
 
 class Defined_Unary_Op(STRINGBase): # R703
     """
-    <defined-unary-op> = . <letter> [ <letter> ]... . 
+    <defined-unary-op> = . <letter> [ <letter> ]... .
     """
     subclass_names = ['Defined_Op']
 
 
 class Defined_Op(STRINGBase): # R703, 723
     """
-    <defined-op> = . <letter> [ <letter> ]... . 
+    <defined-op> = . <letter> [ <letter> ]... .
     """
     subclass_names = []
     def match(string):
@@ -3208,7 +3208,7 @@
 
 class Or_Operand(BinaryOpBase): # R715
     """
-    <or-operand> = [ <or-operand> <and-op> ] <and-operand>    
+    <or-operand> = [ <or-operand> <and-op> ] <and-operand>
     <and-op> = .AND.
     """
     subclass_names = ['And_Operand']
@@ -3264,7 +3264,7 @@
 
 class Defined_Unary_Op(STRINGBase): # R723
     """
-    <defined-unary-op> = . <letter> [ <letter> ]... . 
+    <defined-unary-op> = . <letter> [ <letter> ]... .
     """
     subclass_names = ['Defined_Op']
 
@@ -3337,7 +3337,7 @@
     def match(string):
         return BinaryOpBase.match(Variable, '=', Expr, string, right=False)
     match = staticmethod(match)
-    
+
 class Pointer_Assignment_Stmt(StmtBase): # R735
     """
     <pointer-assignment-stmt> = <data-pointer-object> [ ( <bounds-spec-list> ) ] => <data-target>
@@ -3356,7 +3356,7 @@
     subclass_names = ['Variable_Name']
     use_names = ['Variable', 'Data_Pointer_Component_Name']
     def match(string):
-        return BinaryOpBase.match(Variable, r'%', Data_Pointer_Component_Name, string)            
+        return BinaryOpBase.match(Variable, r'%', Data_Pointer_Component_Name, string)
     match = staticmethod(match)
 
 class Bounds_Spec(SeparatorBase): # R737
@@ -3398,7 +3398,7 @@
     subclass_names = []
     use_names = ['Variable','Procedure_Component_Name']
     def match(string):
-        return BinaryOpBase.match(Variable, r'%', Procedure_Component_Name, string)            
+        return BinaryOpBase.match(Variable, r'%', Procedure_Component_Name, string)
     match = staticmethod(match)
 
 class Proc_Target(Base): # R742
@@ -3429,8 +3429,8 @@
         return Mask_Expr(expr), Where_Assignment_Stmt(stmt)
     match = staticmethod(match)
     def tostr(self): return 'WHERE (%s) %s' % tuple(self.items)
-    
 
+
 class Where_Construct(Base): # R744
     """
     <where-construct> = <where-construct-stmt>
@@ -3507,7 +3507,7 @@
     def tostr(self):
         if self.items[1] is None: return 'ELSEWHERE(%s)' % (self.items[0])
         return 'ELSEWHERE(%s) %s' % self.items
-        
+
 class Elsewhere_Stmt(StmtBase, WORDClsBase): # R750
     """
     <elsewhere-stmt> = ELSEWHERE [ <where-construct-name> ]
@@ -3957,7 +3957,7 @@
         if self.items[2] is not None:
             s += ' %s' % (self.items[2])
         return s
-    
+
 class End_Select_Type_Stmt(EndStmtBase): # R824
     """
     <end-select-type-stmt> = END SELECT [ <select-construct-name> ]
@@ -4051,7 +4051,7 @@
     def tostr(self):
         if self.itens[1] is None: return 'DO %s' % (self.items[0])
         return 'DO %s %s' % self.items
-    
+
 class Nonlabel_Do_Stmt(StmtBase, WORDClsBase): # R829
     """
     <nonlabel-do-stmt> = [ <do-construct-name> : ] DO [ <loop-control> ]
@@ -4087,7 +4087,7 @@
     def tostr(self):
         if len(self.items)==1: return ', WHILE (%s)' % (self.items[0])
         return ', %s = %s' % (self.items[0], ', '.join(map(str,self.items[1])))
-    
+
 class Do_Variable(Base): # R831
     """
     <do-variable> = <scalar-int-variable>
@@ -4348,7 +4348,7 @@
     use_names = ['Connect_Spec_List']
     def match(string): CALLBase.match('OPEN', Connect_Spec_List, string, require_rhs=True)
     match = staticmethod(match)
-    
+
 class Connect_Spec(KeywordValueBase): # R905
     """
     <connect-spec> = [ UNIT = ] <file-unit-number>
@@ -4473,7 +4473,7 @@
     def tostr(self):
         if self.items[1] is None: return 'WRITE(%s)' % (self.items[0])
         return 'WRITE(%s) %s' % tuple(self.items)
-    
+
 class Print_Stmt(StmtBase): # R912
     """
     <print-stmt> = PRINT <format> [ , <output-item-list> ]
@@ -4496,7 +4496,7 @@
     def tostr(self):
         if self.items[1] is None: return 'PRINT %s' % (self.items[0])
         return 'PRINT %s, %s' % tuple(self.items)
-    
+
 class Io_Control_Spec_List(SequenceBase): # R913-list
     """
     <io-control-spec-list> is a list taking into account C910, C917, C918
@@ -5049,7 +5049,7 @@
     subclass_names = []
     def match(string): return STRINGBase.match(['SS','SP','S'], string)
     match = staticmethod(match)
-    
+
 class Blank_Interp_Edit_Desc(STRINGBase): # R1016
     """
     <blank-interp-edit-desc> = BN
@@ -5210,7 +5210,7 @@
         if self.items[3] is not None:
             s += ' %s' % (self.items[3])
         return s
-        
+
 class Module_Nature(STRINGBase): # R1110
     """
     <module-nature> = INTRINSIC
@@ -5397,7 +5397,7 @@
     def match(string): return WORDClsBase.match('IMPORT',Import_Name_List,string,check_colons=True, require_cls=True)
     match = staticmethod(match)
     tostr = WORDClsBase.tostr_a
-    
+
 class External_Stmt(StmtBase, WORDClsBase): # R1210
     """
     <external-stmt> = EXTERNAL [ :: ] <external-name-list>
@@ -5407,7 +5407,7 @@
     def match(string): return WORDClsBase.match('EXTERNAL',External_Name_List,string,check_colons=True, require_cls=True)
     match = staticmethod(match)
     tostr = WORDClsBase.tostr_a
-    
+
 class Procedure_Declaration_Stmt(StmtBase): # R1211
     """
     <procedure-declaration-stmt> = PROCEDURE ( [ <proc-interface> ] ) [ [ , <proc-attr-spec> ]... :: ] <proc-decl-list>
@@ -5441,7 +5441,7 @@
     use_names = ['Null_Init']
     def match(string): return BinaryOpBase.match(Procedure_Entity_Name,'=>', Null_Init, string)
     match = staticmethod(match)
-    
+
 class Interface_Name(Base): # R1215
     """
     <interface-name> = <name>
@@ -5457,7 +5457,7 @@
     def match(string): return WORDClsBase.match('INTRINSIC',Intrinsic_Procedure_Name_List,string,check_colons=True, require_cls=True)
     match = staticmethod(match)
     tostr = WORDClsBase.tostr_a
-    
+
 class Function_Reference(CallBase): # R1217
     """
     <function-reference> = <procedure-designator> ( [ <actual-arg-spec-list> ] )
@@ -5730,7 +5730,7 @@
         if len(string)==6: return None,
         return Scalar_Int_Expr(string[6:].lstrip()),
     match = staticmethod(match)
-    def tostr(self): 
+    def tostr(self):
         if self.items[0] is None: return 'RETURN'
         return 'RETURN %s' % self.items
 
@@ -5833,11 +5833,11 @@
         l = []
         for n in getattr(cls,'subclass_names',[]):
             l1 = _rpl_list(n)
-            for n1 in l1: 
+            for n1 in l1:
                 if n1 not in l:
                     l.append(n1)
         return l
-    
+
     for cls in Base_classes.values():
         if not hasattr(cls, 'subclass_names'): continue
         opt_subclass_names = []
@@ -5881,7 +5881,7 @@
             break
             if n not in subclasses_names:
                 print '%s needs to be added to %s subclass_name list' % (n,cls.__name__)
-        for n in use_names + subclass_names:            
+        for n in use_names + subclass_names:
             if not Base_classes.has_key(n):
                 print '%s not defined used by %s' % (n, cls.__name__)
 

Modified: branches/splitcode/numpy/f2py/lib/parser/base_classes.py
===================================================================
--- branches/splitcode/numpy/f2py/lib/parser/base_classes.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/lib/parser/base_classes.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -95,7 +95,7 @@
     bases = ()
     for c in cls.__bases__:
         bases += get_base_classes(c)
-    return bases + cls.__bases__ + (cls,) 
+    return bases + cls.__bases__ + (cls,)
 
 class Variable:
     """
@@ -391,7 +391,7 @@
 
     def is_array_pointer(self):
         return self.is_array() and self.is_pointer()
-    
+
     def analyze(self):
         typedecl = self.get_typedecl()
         if self.is_array():
@@ -406,7 +406,7 @@
                         shape.append(spec[0])
                     else:
                         shape.append(spec[1]-spec[0])
-                self.shape = shape  
+                self.shape = shape
         return
 
 class ProgramBlock:
@@ -528,7 +528,7 @@
                 lines.append(line+'\n')
             else: lines.append(line+'\n')
         return ''.join(lines).replace('\n     &\n','\n')
-        
+
     def format_message(self, kind, message):
         if self.item is not None:
             message = self.reader.format_message(kind, message,
@@ -613,7 +613,7 @@
             self.blocktype = self.__class__.__name__.lower()
         if not hasattr(self, 'name'):
             # process_item may change this
-            self.name = '__'+self.blocktype.upper()+'__' 
+            self.name = '__'+self.blocktype.upper()+'__'
         Statement.__init__(self, parent, item)
         return
 
@@ -701,7 +701,7 @@
                     return False
                 # item may be cloned that changes the items line:
                 line = item.get_line()
-                
+
         # Check if f77 code contains inline comments or other f90
         # constructs that got undetected by get_source_info.
         if item.reader.isfix77:
@@ -734,10 +734,10 @@
                         % (item.get_line(),self.__class__.__name__),
                         item.span[0], item.span[1])
                 self.show_message(message)
-    
+
                 item.reader.set_mode(False, False)
                 self.classes = classes
-            
+
                 r = BeginStatement.process_subitem(self, item)
                 if r is None:
                     # restore f77 fix mode
@@ -817,4 +817,3 @@
     def tofortran(self, isfix=None):
         return self.get_indent_tab(isfix=isfix) + 'END %s %s'\
                % (self.blocktype.upper(),self.name or '')
-

Modified: branches/splitcode/numpy/f2py/lib/parser/block_statements.py
===================================================================
--- branches/splitcode/numpy/f2py/lib/parser/block_statements.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/lib/parser/block_statements.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -391,7 +391,7 @@
 
 class EndBlockData(EndStatement):
     """
-    END [ BLOCK DATA [ <block-data-name> ] ] 
+    END [ BLOCK DATA [ <block-data-name> ] ]
     """
     match = re.compile(r'end(\s*block\s*data\s*\w*|)\Z', re.I).match
     blocktype = 'blockdata'
@@ -410,7 +410,7 @@
 
     def get_classes(self):
         return specification_part
-        
+
 # Interface
 
 class EndInterface(EndStatement):
@@ -432,7 +432,7 @@
                         | READ ( UNFORMATTED )
                         | WRITE ( FORMATTED )
                         | WRITE ( UNFORMATTED )
-    
+
     """
     modes = ['free90', 'fix90', 'pyf']
     match = re.compile(r'(interface\s*(\w+\s*\(.*\)|\w*)|abstract\s*interface)\Z',re.I).match
@@ -444,7 +444,7 @@
     def get_classes(self):
         l = intrinsic_type_spec + interface_specification
         if self.reader.mode=='pyf':
-            return [Subroutine, Function] + l 
+            return [Subroutine, Function] + l
         return l
 
     def process_item(self):
@@ -498,7 +498,7 @@
         s +=  HasAttributes.topyf(self, tab=tab+'  ')
         s +=  HasUseStmt.topyf(self, tab=tab+'  ')
         s += tab + 'END' + self.tostr() + '\n'
-        return s        
+        return s
 
 # Subroutine
 
@@ -729,7 +729,7 @@
 class Select(BeginStatement):
     """
     [ <case-construct-name> : ] SELECT CASE ( <case-expr> )
-    
+
     """
     match = re.compile(r'select\s*case\s*\(.*\)\Z',re.I).match
     end_stmt_cls = EndSelect
@@ -738,7 +738,7 @@
         return 'SELECT CASE ( %s )' % (self.expr)
     def process_item(self):
         self.expr = self.item.get_line()[6:].lstrip()[4:].lstrip()[1:-1].strip()
-        self.name = self.item.label                
+        self.name = self.item.label
         return BeginStatement.process_item(self)
 
     def get_classes(self):
@@ -751,8 +751,8 @@
     END WHERE [ <where-construct-name> ]
     """
     match = re.compile(r'end\s*\where\s*\w*\Z',re.I).match
-    
 
+
 class Where(BeginStatement):
     """
     [ <where-construct-name> : ] WHERE ( <mask-expr> )
@@ -782,7 +782,7 @@
     END FORALL [ <forall-construct-name> ]
     """
     match = re.compile(r'end\s*forall\s*\w*\Z',re.I).match
-    
+
 class Forall(BeginStatement):
     """
     [ <forall-construct-name> : ] FORALL <forall-header>
@@ -842,7 +842,7 @@
         self.expr = line[1:-1].strip()
         self.name = item.label
         return BeginStatement.process_item(self)
-        
+
     def get_classes(self):
         return [Else, ElseIf] + execution_part_construct
 
@@ -883,7 +883,7 @@
             self.put_item(newitem)
         self.isvalid = False
         return
-        
+
     def tostr(self):
         assert len(self.content)==1,`self.content`
         return 'IF (%s) %s' % (self.expr, str(self.content[0]).lstrip())
@@ -959,7 +959,7 @@
     """
     match = re.compile(r'associate\s*\(.*\)\Z',re.I).match
     end_stmt_cls = EndAssociate
-    
+
     def process_item(self):
         line = self.item.get_line()[9:].lstrip()
         self.associations = line[1:-1].strip()
@@ -1090,7 +1090,7 @@
     def topyf(self, tab=''):
         s = tab + 'TYPE'
         if self.a.extends is not None:
-            s += ', EXTENDS(%s) ::' % (self.a.extends) 
+            s += ', EXTENDS(%s) ::' % (self.a.extends)
         s += ' ' + self.name
         if self.a.parameters:
             s += ' (%s)' % (', '.join(self.a.parameters))
@@ -1171,7 +1171,7 @@
 derived_type_spec = [  ]
 type_spec = intrinsic_type_spec + derived_type_spec
 declaration_type_spec = intrinsic_type_spec + [ TypeStmt, Class ]
-    
+
 type_declaration_stmt = declaration_type_spec
 
 private_or_sequence = [ Private, Sequence ]

Modified: branches/splitcode/numpy/f2py/lib/parser/parsefortran.py
===================================================================
--- branches/splitcode/numpy/f2py/lib/parser/parsefortran.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/lib/parser/parsefortran.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -79,7 +79,7 @@
         if self.block is None:
             self.reader.show_message('Nothing to analyze.')
             return
-        
+
         try:
             self.block.analyze()
         except AnalyzeError:
@@ -129,9 +129,9 @@
     hey = 1
     end subroutine bar
     abstract interface
- 
+
     end interface
- 
+
 end module foo
 """
     reader = FortranStringReader(string, True, False)
@@ -195,4 +195,3 @@
     simple_main()
     #profile_main()
     #parse_all_f()
-    

Modified: branches/splitcode/numpy/f2py/lib/parser/readfortran.py
===================================================================
--- branches/splitcode/numpy/f2py/lib/parser/readfortran.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/lib/parser/readfortran.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -52,9 +52,9 @@
 class Line:
     """ Holds a Fortran source line.
     """
-    
+
     f2py_strmap_findall = re.compile(r'(_F2PY_STRING_CONSTANT_\d+_|F2PY_EXPR_TUPLE_\d+)').findall
-    
+
     def __init__(self, line, linenospan, label, reader):
         self.line = line.strip()
         self.span = linenospan
@@ -87,7 +87,7 @@
         self.line = self.apply_map(line)
         self.strline = None
         return
-    
+
     def __repr__(self):
         return self.__class__.__name__+'(%r,%s,%r)' \
                % (self.line, self.span, self.label)
@@ -182,7 +182,7 @@
                  used to retrive a line.
         source may contain
           - Fortran 77 code
-          - fixed format Fortran 90 code          
+          - fixed format Fortran 90 code
           - free format Fortran 90 code
           - .pyf signatures - extended free format Fortran 90 syntax
         """
@@ -277,7 +277,7 @@
         return self
 
     def next(self, ignore_comments = False):
-            
+
         try:
             if self.reader is not None:
                 try:
@@ -402,7 +402,7 @@
                 break
             linenostr = '%5d:' % (i)
             if i==endlineno:
-                sourceline = self.source_lines[i-1] 
+                sourceline = self.source_lines[i-1]
                 l0 = linenostr+sourceline[:startcolno]
                 if endcolno==-1:
                     l1 = sourceline[startcolno:]
@@ -414,7 +414,7 @@
             else:
                 r.append(linenostr+ self.source_lines[i-1])
         return '\n'.join(r)
-    
+
     def format_error_message(self, message, startlineno, endlineno,
                              startcolno=0, endcolno=-1):
         return self.format_message('ERROR',message, startlineno,
@@ -555,7 +555,7 @@
             # XXX: should we do line.replace('\\'+mlstr[0],mlstr[0])
             #      for line in multilines?
             return self.multiline_item(prefix,multilines,suffix,
-                                       startlineno, self.linecount)        
+                                       startlineno, self.linecount)
 
     # The main method of interpreting raw source lines within
     # the following contexts: f77, fixed f90, free f90, pyf.
@@ -565,7 +565,7 @@
         a source item is ..
         - a fortran line
         - a list of continued fortran lines
-        - a multiline - lines inside triple-qoutes, only when in ispyf mode        
+        - a multiline - lines inside triple-qoutes, only when in ispyf mode
         """
         get_single_line = self.get_single_line
         line = get_single_line()
@@ -613,7 +613,7 @@
             return self.line_item(''.join(lines),startlineno,self.linecount,label)
 
         handle_inline_comment = self.handle_inline_comment
-        
+
         if self.isfix90 and not is_f2py_directive:
             # handle inline comment
             newline,qc = handle_inline_comment(line[6:], startlineno)
@@ -739,7 +739,7 @@
         self.file.close()
 
 class FortranStringReader(FortranReaderBase):
-    
+
     def __init__(self, string, isfree, isstrict, include_dirs = None):
         self.id = 'string-'+str(id(string))
         source = StringIO(string)
@@ -765,7 +765,7 @@
     reader = FortranStringReader(string_f77,False,True)
     for item in reader:
         print item
-    
+
     filename = tempfile.mktemp()+'.f'
     f = open(filename,'w')
     f.write(string_f77)
@@ -823,7 +823,7 @@
        obj%bin_wid,'  VEL_DMO = ', obj%vel_dmo
       end subroutine foo
       subroutine
- 
+
      & foo
       end
 """

Modified: branches/splitcode/numpy/f2py/lib/parser/sourceinfo.py
===================================================================
--- branches/splitcode/numpy/f2py/lib/parser/sourceinfo.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/lib/parser/sourceinfo.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -76,6 +76,6 @@
     for filename in sys.argv[1:]:
         isfree, isstrict = get_source_info(filename)
         print '%s: isfree=%s, isstrict=%s'  % (filename, isfree, isstrict)
-    
+
 if __name__ == '__main__':
     simple_main()

Modified: branches/splitcode/numpy/f2py/lib/parser/splitline.py
===================================================================
--- branches/splitcode/numpy/f2py/lib/parser/splitline.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/lib/parser/splitline.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -209,7 +209,7 @@
         quotechar = self.quotechar
         l = []
         l_append = l.append
-        
+
         nofslashes = 0
         if quotechar is None:
             # search for string start
@@ -323,7 +323,7 @@
         self.startchar = paren[0]
         self.endchar = paren[1]
         self.stopchar = None
-        
+
     def get_item(self):
         fifo_pop = self.fifo_line.pop
         try:
@@ -336,7 +336,7 @@
         stopchar = self.stopchar
         l = []
         l_append = l.append
-        
+
         nofslashes = 0
         if stopchar is None:
             # search for parenthesis start
@@ -377,7 +377,7 @@
             except IndexError:
                 break
         return ParenString(''.join(l))
-                
+
 def test():
     splitter = LineSplitter('abc\\\' def"12\\"3""56"dfad\'a d\'')
     l = [item for item in splitter]
@@ -394,7 +394,7 @@
     l,stopchar = splitquote('"abc123&')
     assert l==['"abc123&'],`l`
     assert stopchar=='"'
-    
+
     splitter = LineSplitter(' &abc"123','"')
     l = [item for item in splitter]
     assert l==[' &abc"','123']
@@ -402,7 +402,7 @@
     l,stopchar = splitquote(' &abc"123','"')
     assert l==[' &abc"','123']
     assert stopchar is None
-        
+
     l = split2('')
     assert l==('',''),`l`
     l = split2('12')
@@ -424,4 +424,3 @@
 
 if __name__ == '__main__':
     test()
-

Modified: branches/splitcode/numpy/f2py/lib/parser/statements.py
===================================================================
--- branches/splitcode/numpy/f2py/lib/parser/statements.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/lib/parser/statements.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -95,7 +95,7 @@
             if sign=='=>':
                 self.__class__ = PointerAssignment
             else:
-                self.__class__ = Assignment            
+                self.__class__ = Assignment
         apply_map = self.item.apply_map
         self.variable = apply_map(m.group('variable').replace(' ',''))
         self.expr = apply_map(m.group('expr'))
@@ -247,7 +247,7 @@
         tab = self.get_indent_tab(isfix=isfix)
         if self.items:
             return tab + 'GO TO %s (%s)' \
-                   % (self.varname, ', '.join(self.items)) 
+                   % (self.varname, ', '.join(self.items))
         return tab + 'GO TO %s' % (self.varname)
     def analyze(self): return
 
@@ -339,7 +339,7 @@
                              | [ NML = ] <namelist-group-name>
                              | ADVANCE = <scalar-default-char-expr>
                              ...
-    
+
 Read1:    READ <format> [, <input-item-list>]
     <format> == <default-char-expr> | <label> | *
     """
@@ -525,7 +525,7 @@
     def tofortran(self, isfix=None): return self.get_indent_tab(isfix=isfix) \
         + 'DEALLOCATE (%s)' % (', '.join(self.items))
     def analyze(self): return
-    
+
 class ModuleProcedure(Statement):
     """
     [ MODULE ] PROCEDURE <procedure-name-list>
@@ -704,7 +704,7 @@
                             ...
     <sign-edit-descr> = SS | SP | S
     ...
-    
+
     """
     match = re.compile(r'format\s*\(.*\)\Z', re.I).match
     def process_item(self):
@@ -775,7 +775,7 @@
                    | <substring>
     <array-element> = <data-ref>
     <array-section> = <data-ref> [ ( <substring-range> ) ]
-    
+
     """
     match = re.compile(r'data\b',re.I).match
 
@@ -903,7 +903,7 @@
         module = modules[self.name]
         use_provides = self.parent.a.use_provides
         print use
-        
+
         return
 
 class Exit(Statement):
@@ -966,7 +966,7 @@
 class Dimension(Statement):
     """
     DIMENSION [ :: ] <array-name> ( <array-spec> ) [ , <array-name> ( <array-spec> ) ]...
-    
+
     """
     match = re.compile(r'dimension\b', re.I).match
     def process_item(self):
@@ -990,7 +990,7 @@
 class Target(Statement):
     """
     TARGET [ :: ] <object-name> ( <array-spec> ) [ , <object-name> ( <array-spec> ) ]...
-    
+
     """
     match = re.compile(r'target\b', re.I).match
     def process_item(self):
@@ -1018,7 +1018,7 @@
     POINTER [ :: ] <pointer-decl-list>
     <pointer-decl> = <object-name> [ ( <deferred-shape-spec-list> ) ]
                    | <proc-entity-name>
-    
+
     """
     match = re.compile(r'pointer\b',re.I).match
     def process_item(self):
@@ -1111,7 +1111,7 @@
     """
     INQUIRE ( <inquire-spec-list> )
     INQUIRE ( IOLENGTH = <scalar-int-variable> ) <output-item-list>
-    
+
     <inquire-spec> = [ UNIT = ] <file-unit-number>
                      | FILE = <file-name-expr>
                      ...
@@ -1495,7 +1495,7 @@
         s += ' :: ' + self.spec + ' => ' + ', '.join(self.items)
         return tab + s
 
-        
+
 class FinalBinding(StatementWithNamelist):
     """
     FINAL [ :: ] <final-subroutine-name-list>
@@ -1515,7 +1515,7 @@
         self.items = split_comma(line, self.item)
         return
     def tofortran(self, isfix=None):
-        return self.get_indent_tab(isfix=isfix) + 'ALLOCATABLE ' + ', '.join(self.items) 
+        return self.get_indent_tab(isfix=isfix) + 'ALLOCATABLE ' + ', '.join(self.items)
     def analyze(self):
         for line in self.items:
             i = line.find('(')
@@ -1583,7 +1583,7 @@
         if self.name and self.name!=parent_name:
             self.warning('expected if-construct-name %r but got %r, skipping.'\
                          % (parent_name, self.name))
-            self.isvalid = False        
+            self.isvalid = False
         return
 
     def tofortran(self, isfix=None):
@@ -1610,9 +1610,9 @@
         if self.name and self.name!=parent_name:
             self.warning('expected if-construct-name %r but got %r, skipping.'\
                          % (parent_name, self.name))
-            self.isvalid = False        
+            self.isvalid = False
         return
-        
+
     def tofortran(self, isfix=None):
         s = ''
         if self.name:
@@ -1658,7 +1658,7 @@
         if self.name and self.name!=parent_name:
             self.warning('expected case-construct-name %r but got %r, skipping.'\
                          % (parent_name, self.name))
-            self.isvalid = False        
+            self.isvalid = False
         return
 
     def tofortran(self, isfix=None):
@@ -1854,4 +1854,3 @@
             return self.get_indent_tab(isfix=isfix) + 'PAUSE ' + self.value
         return self.get_indent_tab(isfix=isfix) + 'PAUSE'
     def analyze(self): return
-

Modified: branches/splitcode/numpy/f2py/lib/parser/test_Fortran2003.py
===================================================================
--- branches/splitcode/numpy/f2py/lib/parser/test_Fortran2003.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/lib/parser/test_Fortran2003.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -325,7 +325,7 @@
         a = cls('0.0D+0')
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'0.0D+0')
-        
+
 class test_Char_Selector(NumpyTestCase): # R424
 
     def check_char_selector(self):
@@ -343,7 +343,7 @@
         a = cls('(2, 8)')
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'(LEN = 2, KIND = 8)')
-        
+
         a = cls('(kind=8)')
         assert isinstance(a,cls),`a`
         assert_equal(str(a),'(KIND = 8)')
@@ -728,7 +728,7 @@
         a = cls('a')
         assert isinstance(a,Name),`a`
         assert_equal(str(a),'a')
-    
+
 class test_Component_Spec(NumpyTestCase): # R458
 
     def check_simple(self):
@@ -820,7 +820,7 @@
         assert_equal(str(a),'a')
 
 class test_Ac_Implied_Do(NumpyTestCase): # R470
-    
+
     def check_ac_implied_do(self):
         cls = Ac_Implied_Do
         a = cls('( a, b, n = 1, 5 )')
@@ -876,7 +876,7 @@
         a = cls('Integer*2')
         assert isinstance(a, Intrinsic_Type_Spec),`a`
         assert_equal(str(a), 'INTEGER*2')
-        
+
         a = cls('type(foo)')
         assert isinstance(a, cls),`a`
         assert_equal(str(a), 'TYPE(foo)')
@@ -969,7 +969,7 @@
         assert_equal(str(a),'a')
 
 class test_Upper_Bound(NumpyTestCase): # R513
-    
+
     def check_simple(self):
         cls = Upper_Bound
         a = cls('a')
@@ -1055,7 +1055,7 @@
         a = cls('PARAMETER        ( ONE = 1.0D+0, ZERO = 0.0D+0 )')
         assert isinstance(a, cls),`a`
         assert_equal(str(a),'PARAMETER(ONE = 1.0D+0, ZERO = 0.0D+0)')
-        
+
 class test_Named_Constant_Def(NumpyTestCase): # R539
 
     def check_simple(self):
@@ -1170,7 +1170,7 @@
 ###############################################################################
 
 class test_Substring(NumpyTestCase): # R609
-    
+
     def check_simple(self):
         cls = Substring
         a = cls('a(:)')
@@ -1185,7 +1185,7 @@
 
 
 class test_Substring_Range(NumpyTestCase): # R611
-    
+
     def check_simple(self):
         cls = Substring_Range
         a = cls(':')
@@ -1237,7 +1237,7 @@
         assert_equal(str(a),'a')
 
 class test_Type_Param_Inquiry(NumpyTestCase): # R615
-    
+
     def check_simple(self):
         cls = Type_Param_Inquiry
         a = cls('a % b')
@@ -1272,7 +1272,7 @@
         a = cls('zzz')
         assert isinstance(a, Name),`a`
         assert_equal(str(a),'zzz')
-        
+
 class test_Section_Subscript_List(NumpyTestCase): # R619-list
 
     def check_simple(self):
@@ -1320,7 +1320,7 @@
         assert_equal(str(a),'a + 1 :')
 
 class test_Alloc_Opt(NumpyTestCase): # R624
-    
+
     def check_simple(self):
         cls = Alloc_Opt
         a = cls('stat=a')
@@ -1329,7 +1329,7 @@
         assert_equal(repr(a),"Alloc_Opt('STAT', Name('a'))")
 
 class test_Nullify_Stmt(NumpyTestCase): # R633
-    
+
     def check_simple(self):
         cls = Nullify_Stmt
         a = cls('nullify (a)')
@@ -1662,7 +1662,7 @@
         self.assertRaises(NoMatchError,Scalar_Int_Expr,'a,b')
 
 class test_Assignment_Stmt(NumpyTestCase): # R734
-    
+
     def check_simple(self):
         cls = Assignment_Stmt
         a = cls('a = b')
@@ -1792,7 +1792,7 @@
             a = cls('123,a')
             assert isinstance(a, cls),`a`
             assert_equal(str(a),'UNIT = 123, NML = a')
-        
+
 class test_Format(NumpyTestCase): # R914
 
     def check_simple(self):
@@ -2096,6 +2096,6 @@
     print 'Nof tests needs:',nof_needed_tests,'out of',total_needs
     print 'Total number of classes:',total_classes
     print '-----'
-    
+
 if __name__ == "__main__":
     NumpyTest().run()

Modified: branches/splitcode/numpy/f2py/lib/parser/test_parser.py
===================================================================
--- branches/splitcode/numpy/f2py/lib/parser/test_parser.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/lib/parser/test_parser.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -97,7 +97,7 @@
         assert_equal(parse(Read, 'read "hey a" , a'),'READ "hey a", a')
         assert_equal(parse(Read, 'read * , a  , b'),'READ *, a, b')
         assert_equal(parse(Read, 'read ( unit  =10 )'),'READ (UNIT = 10)')
-        
+
     def check_write(self):
         assert_equal(parse(Write, 'write ( 10 )'),'WRITE (10)')
         assert_equal(parse(Write, 'write ( 10 , a )'),'WRITE (10, a)')
@@ -207,7 +207,7 @@
 
     def check_exit(self):
         assert_equal(parse(Exit,'exit'),'EXIT')
-        assert_equal(parse(Exit,'exit ab'),'EXIT ab')        
+        assert_equal(parse(Exit,'exit ab'),'EXIT ab')
 
     def check_parameter(self):
         assert_equal(parse(Parameter,'parameter (a = b(1,2))'),
@@ -481,7 +481,7 @@
                      'CHARACTER(LEN=3, KIND=fA(1,2))')
         assert_equal(parse(Character,'character(len=3,kind=fA(1,2))'),
                      'CHARACTER(LEN=3, KIND=fa(1,2))')
-        
+
     def check_implicit(self):
         assert_equal(parse(Implicit,'implicit none'),'IMPLICIT NONE')
         assert_equal(parse(Implicit,'implicit'),'IMPLICIT NONE')

Modified: branches/splitcode/numpy/f2py/lib/parser/typedecl_statements.py
===================================================================
--- branches/splitcode/numpy/f2py/lib/parser/typedecl_statements.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/lib/parser/typedecl_statements.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -47,7 +47,7 @@
     EXTENSION:
       <kind-selector> = ( [ KIND = ] <scalar-int-initialization-expr> )
                         | * <length>
-    
+
     <char-selector> = <length-selector>
                       | ( LEN = <type-param-value>, KIND = <scalar-int-initialization-expr> )
                       | ( <type-param-value>, [ KIND = ] <scalar-int-initialization-expr> )
@@ -218,7 +218,7 @@
                     kind = l[4:].lstrip()[1:].lstrip()
                     l = ''
                 else:
-                    kind = ''                    
+                    kind = ''
             else:
                 assert len(l)==2
                 if l[0].lower().startswith('len'):
@@ -257,7 +257,7 @@
                     s += '*%s' % (length)
                 if kind:
                     s += '(KIND=%s)' % (kind)
-                
+
         return clsname + s
 
     def tofortran(self,isfix=None):
@@ -270,7 +270,7 @@
         if self.entity_decls:
             s += ' ' + ', '.join(self.entity_decls)
         return tab + s
-    
+
     def __str__(self):
         return self.tofortran()
 
@@ -415,7 +415,7 @@
     def get_part_typedecl(self):
         bz = self.get_byte_size()/2
         return Real(self.parent, self.item.copy('REAL*%s' % (bz)))
-        
+
 class DoubleComplex(TypeDeclarationStatement):
     # not in standard
     match = re.compile(r'double\s*complex\b',re.I).match
@@ -474,7 +474,7 @@
 
     def get_bit_size(self):
         return self.get_type_decl(self.name).get_bit_size()
-    
+
 TypeStmt = Type
 
 class Class(TypeDeclarationStatement):

Modified: branches/splitcode/numpy/f2py/lib/py_wrap.py
===================================================================
--- branches/splitcode/numpy/f2py/lib/py_wrap.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/lib/py_wrap.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -76,7 +76,7 @@
         self.defined_types = []
         self.defined_capi_codes = []
 
-        
+
         self.header_list = []
         self.typedef_list = []
         self.extern_list = []
@@ -121,7 +121,7 @@
         else:
             raise NotImplementedError,`block.__class__.__name__`
         return
-    
+
     def c_code(self):
         return self.apply_attributes(self.main_template)
     def fortran_code(self):

Modified: branches/splitcode/numpy/f2py/lib/py_wrap_subprogram.py
===================================================================
--- branches/splitcode/numpy/f2py/lib/py_wrap_subprogram.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/lib/py_wrap_subprogram.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 __all__ = ['PythonCAPISubProgram']
 
 import sys
@@ -88,7 +87,7 @@
         if cname in defined:
             return
         defined.append(cname)
-        
+
         self.info('Generating interface for %s %s: %s' % (parent.modulename, block.__class__.__name__, cname))
         self.parent = parent
 
@@ -105,7 +104,7 @@
         self.fortran_code_template = ''
 
         WrapperCPPMacro(parent, 'F_FUNC')
-        
+
         if isinstance(block.parent, Module):
             self.mname = block.parent.name
             self.init_func = '%s_init' % (name)
@@ -199,8 +198,8 @@
         self.ctype_args_f_list = ctype_args_f + extra_ctype_args_f
         if not self.ctype_args_f_list:
             self.ctype_args_f_list.append('void')
-        
 
+
         self.clean_pyobjfrom_list.reverse()
         self.clean_call_list.reverse()
         self.clean_frompyobj_list.reverse()

Modified: branches/splitcode/numpy/f2py/lib/py_wrap_type.py
===================================================================
--- branches/splitcode/numpy/f2py/lib/py_wrap_type.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/lib/py_wrap_type.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 __all__ = ['PythonCAPIType', 'PyTypeInterface']
 
 from wrapper_base import *
@@ -331,7 +330,7 @@
 #endif
   return return_value;
 }
-''' 
+'''
     def __init__(self, parent, typedecl):
         WrapperBase.__init__(self)
         self.name = name = typedecl.name
@@ -342,7 +341,7 @@
         if ctype in defined:
             return
         defined.append(ctype)
-        
+
         self.info('Generating interface for %s: %s' % (typedecl.__class__.__name__, ctype))
         self.parent = parent
         if isinstance(typedecl, (Integer,Byte,Real,DoublePrecision)):
@@ -601,7 +600,7 @@
    if (!PyArg_ParseTuple(capi_args,"%(attr_format_elist)s"
                                    %(attr_init_clist)s))
       return_value = -1;
-   
+
 #if defined(F2PY_DEBUG_PYOBJ_TOFROM)
   fprintf(stderr,"%(otype)s_init: return_value=%%d, PyErr_Occurred()=%%p\\n", return_value, PyErr_Occurred());
 #endif
@@ -656,7 +655,7 @@
             self.wrappermodulename = typedecl.parent.name
         else:
             self.info('Generating interface for %s.%s: %s' % (parent.modulename, typedecl.name, ctype))
-        
+
         parent.isf90 = True
         self.parent = parent
         self.name = name = typedecl.name

Modified: branches/splitcode/numpy/f2py/lib/test_derived_scalar.py
===================================================================
--- branches/splitcode/numpy/f2py/lib/test_derived_scalar.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/lib/test_derived_scalar.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -94,6 +94,6 @@
         assert_equal(a.flag,2)
         assert_equal(r.flag,4)
 
-        
+
 if __name__ == "__main__":
     NumpyTest().run()

Modified: branches/splitcode/numpy/f2py/lib/test_scalar_function_in.py
===================================================================
--- branches/splitcode/numpy/f2py/lib/test_scalar_function_in.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/lib/test_scalar_function_in.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -549,6 +549,6 @@
         assert_equal(r,'1bcde')
         r = func('')
         assert_equal(r,'')
-        
+
 if __name__ == "__main__":
     NumpyTest().run()

Modified: branches/splitcode/numpy/f2py/lib/test_scalar_in_out.py
===================================================================
--- branches/splitcode/numpy/f2py/lib/test_scalar_in_out.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/lib/test_scalar_in_out.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -547,6 +547,6 @@
         assert_equal(r,'1bcde')
         r = func('')
         assert_equal(r,'')
-        
+
 if __name__ == "__main__":
     NumpyTest().run()

Modified: branches/splitcode/numpy/f2py/lib/wrapper_base.py
===================================================================
--- branches/splitcode/numpy/f2py/lib/wrapper_base.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/lib/wrapper_base.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 import os
 import sys
 import re
@@ -57,7 +56,7 @@
             elif d.endswith('.c'):
                 WrapperCCode(parent, d[:-2])
             else:
-                self.warning('Unknown dependence: %r.' % (d))        
+                self.warning('Unknown dependence: %r.' % (d))
         return
 
     def apply_attributes(self, template):

Modified: branches/splitcode/numpy/f2py/rules.py
===================================================================
--- branches/splitcode/numpy/f2py/rules.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/rules.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -173,7 +173,7 @@
 \tm = #modulename#_module = Py_InitModule(\"#modulename#\", f2py_module_methods);
 \tPyFortran_Type.ob_type = &PyType_Type;
 \timport_array();
-\tif (PyErr_Occurred()) 
+\tif (PyErr_Occurred())
 \t\t{PyErr_SetString(PyExc_ImportError, \"can't initialize module #modulename# (failed to import numpy)\"); return;}
 \td = PyModule_GetDict(m);
 \ts = PyString_FromString(\"$R"""+"""evision: $\");

Modified: branches/splitcode/numpy/f2py/tests/array_from_pyobj/setup.py
===================================================================
--- branches/splitcode/numpy/f2py/tests/array_from_pyobj/setup.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/tests/array_from_pyobj/setup.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 import os
 def configuration(parent_name='',top_path=None):
     from numpy.distutils.misc_util import Configuration

Modified: branches/splitcode/numpy/f2py/tests/c/return_real.py
===================================================================
--- branches/splitcode/numpy/f2py/tests/c/return_real.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/tests/c/return_real.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -6,7 +6,6 @@
   python return_real.py --quiet
 """
 
-
 import f2py2e
 from Numeric import array
 

Modified: branches/splitcode/numpy/f2py/tests/f77/callback.py
===================================================================
--- branches/splitcode/numpy/f2py/tests/f77/callback.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/tests/f77/callback.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 __usage__ = """
 Run:
   python callback.py [<f2py options>]

Modified: branches/splitcode/numpy/f2py/tests/f77/return_character.py
===================================================================
--- branches/splitcode/numpy/f2py/tests/f77/return_character.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/tests/f77/return_character.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 __usage__ = """
 Run:
   python return_character.py [<f2py options>]

Modified: branches/splitcode/numpy/f2py/tests/f77/return_complex.py
===================================================================
--- branches/splitcode/numpy/f2py/tests/f77/return_complex.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/tests/f77/return_complex.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -6,7 +6,6 @@
   python return_complex.py --quiet
 """
 
-
 import f2py2e
 from Numeric import array
 

Modified: branches/splitcode/numpy/f2py/tests/f77/return_integer.py
===================================================================
--- branches/splitcode/numpy/f2py/tests/f77/return_integer.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/tests/f77/return_integer.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 __usage__ = """
 Run:
   python return_integer.py [<f2py options>]

Modified: branches/splitcode/numpy/f2py/tests/f77/return_logical.py
===================================================================
--- branches/splitcode/numpy/f2py/tests/f77/return_logical.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/tests/f77/return_logical.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 __usage__ = """
 Run:
   python return_logical.py [<f2py options>]

Modified: branches/splitcode/numpy/f2py/tests/f77/return_real.py
===================================================================
--- branches/splitcode/numpy/f2py/tests/f77/return_real.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/tests/f77/return_real.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -6,7 +6,6 @@
   python return_real.py --quiet
 """
 
-
 import numpy.f2py as f2py2e
 from numpy import array
 

Modified: branches/splitcode/numpy/f2py/tests/f90/return_character.py
===================================================================
--- branches/splitcode/numpy/f2py/tests/f90/return_character.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/tests/f90/return_character.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 __usage__ = """
 Run:
   python return_character.py [<f2py options>]

Modified: branches/splitcode/numpy/f2py/tests/f90/return_complex.py
===================================================================
--- branches/splitcode/numpy/f2py/tests/f90/return_complex.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/tests/f90/return_complex.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -5,7 +5,6 @@
   python return_complex.py --quiet
 """
 
-
 import f2py2e
 from Numeric import array
 

Modified: branches/splitcode/numpy/f2py/tests/f90/return_integer.py
===================================================================
--- branches/splitcode/numpy/f2py/tests/f90/return_integer.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/tests/f90/return_integer.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 # XXX: investigate cases that are disabled under win32
 #
 

Modified: branches/splitcode/numpy/f2py/tests/f90/return_logical.py
===================================================================
--- branches/splitcode/numpy/f2py/tests/f90/return_logical.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/f2py/tests/f90/return_logical.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 __usage__ = """
 Run:
   python return_logical.py [<f2py options>]

Modified: branches/splitcode/numpy/fft/fftpack.py
===================================================================
--- branches/splitcode/numpy/fft/fftpack.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/fft/fftpack.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -36,7 +36,7 @@
     a = asarray(a)
 
     if n == None: n = a.shape[axis]
-    
+
     if n < 1: raise ValueError("Invalid number of FFT data points (%d) specified." % n)
 
     try:

Modified: branches/splitcode/numpy/fft/helper.py
===================================================================
--- branches/splitcode/numpy/fft/helper.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/fft/helper.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -6,7 +6,7 @@
 __all__ = ['fftshift','ifftshift','fftfreq']
 
 from numpy.core import asarray, concatenate, arange, take, \
-    array, integer
+    integer
 from numpy import hstack
 import types
 

Modified: branches/splitcode/numpy/fft/setup.py
===================================================================
--- branches/splitcode/numpy/fft/setup.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/fft/setup.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,5 +1,4 @@
 
-from os.path import join
 
 def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration

Modified: branches/splitcode/numpy/lib/__init__.py
===================================================================
--- branches/splitcode/numpy/lib/__init__.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/lib/__init__.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 from info import __doc__
 from numpy.version import version as __version__
 

Modified: branches/splitcode/numpy/lib/arraysetops.py
===================================================================
--- branches/splitcode/numpy/lib/arraysetops.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/lib/arraysetops.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,5 +1,5 @@
 """
-Set operations for 1D numeric arrays based on sort() function.
+Set operations for 1D numeric arrays based on sorting.
 
 Contains:
   ediff1d,
@@ -11,16 +11,16 @@
   union1d,
   setdiff1d
 
-All functions work best with integer numerical arrays on input
-(e.g. indices). For floating point arrays, innacurate results may appear due to
-usual round-off and floating point comparison issues.
+All functions work best with integer numerical arrays on input (e.g. indices).
+For floating point arrays, innacurate results may appear due to usual round-off
+and floating point comparison issues.
 
 Except unique1d, union1d and intersect1d_nu, all functions expect inputs with
-unique elements. Speed could be gained in some operations by an implementaion
-of sort(), that can provide directly the permutation vectors, avoiding thus
-calls to argsort().
+unique elements. Speed could be gained in some operations by an implementaion of
+sort(), that can provide directly the permutation vectors, avoiding thus calls
+to argsort().
 
-Run test_unique1d_speed() to compare performance of numpy.unique1d() and
+Run _test_unique1d_speed() to compare performance of numpy.unique1d() and
 numpy.unique() - it should be the same.
 
 To do: Optionally return indices analogously to unique1d for all functions.
@@ -28,7 +28,7 @@
 Author: Robert Cimrman
 
 created:       01.11.2005
-last revision: 12.10.2006
+last revision: 07.01.2007
 """
 __all__ = ['ediff1d', 'unique1d', 'intersect1d', 'intersect1d_nu', 'setxor1d',
            'setmember1d', 'union1d', 'setdiff1d']
@@ -37,42 +37,72 @@
 import numpy as nm
 
 def ediff1d(ary, to_end = None, to_begin = None):
-    """Array difference with prefixed and/or appended value.
+    """The differences between consecutive elements of an array, possibly with
+    prefixed and/or appended values.
 
-    See also: unique1d, intersect1d, intersect1d_nu, setxor1d,
-    setmember1d, union1d, setdiff1d
+    :Parameters:
+      - `ary` : array
+        This array will be flattened before the difference is taken.
+      - `to_end` : number, optional
+        If provided, this number will be tacked onto the end of the returned
+        differences.
+      - `to_begin` : number, optional
+        If provided, this number will be taked onto the beginning of the
+        returned differences.
+
+    :Returns:
+      - `ed` : array
+        The differences. Loosely, this will be (ary[1:] - ary[:-1]).
     """
     ary = nm.asarray(ary).flat
     ed = ary[1:] - ary[:-1]
+    arrays = [ed]
     if to_begin is not None:
-        if to_end is not None:
-            ed = nm.r_[to_begin, ed, to_end]
-        else:
-            ed = nm.insert(ed, 0, to_begin)
-    elif to_end is not None:
-        ed = nm.append(ed, to_end)
-        
+        arrays.insert(0, to_begin)
+    if to_end is not None:
+        arrays.append(to_end)
+
+    if len(arrays) != 1:
+        # We'll save ourselves a copy of a potentially large array in the common
+        # case where neither to_begin or to_end was given.
+        ed = nm.hstack(arrays)
+
     return ed
 
 def unique1d(ar1, return_index=False):
-    """Unique elements of 1D array. When return_index is True, return
-    also the indices indx such that ar1.flat[indx] is the resulting
-    array of unique elements.
-    
-    See also: ediff1d, intersect1d, intersect1d_nu, setxor1d,
-    setmember1d, union1d, setdiff1d
+    """Find the unique elements of 1D array.
+
+    Most of the other array set operations operate on the unique arrays
+    generated by this function.
+
+    :Parameters:
+      - `ar1` : array
+        This array will be flattened if it is not already 1D.
+      - `return_index` : bool, optional
+        If True, also return the indices against ar1 that result in the unique
+        array.
+
+    :Returns:
+      - `unique` : array
+        The unique values.
+      - `unique_indices` : int array, optional
+        The indices of the unique values. Only provided if return_index is True.
+
+    :See also:
+      numpy.lib.arraysetops has a number of other functions for performing set
+      operations on arrays.
     """
     ar = nm.asarray(ar1).flatten()
     if ar.size == 0:
         if return_index: return nm.empty(0, nm.bool), ar
         else: return ar
-    
+
     if return_index:
         perm = ar.argsort()
         aux = ar[perm]
         flag = nm.concatenate( ([True], aux[1:] != aux[:-1]) )
         return perm[flag], aux[flag]
-    
+
     else:
         ar.sort()
         flag = nm.concatenate( ([True], ar[1:] != ar[:-1]) )
@@ -81,8 +111,20 @@
 def intersect1d( ar1, ar2 ):
     """Intersection of 1D arrays with unique elements.
 
-    See also: ediff1d, unique1d, intersect1d_nu, setxor1d,
-    setmember1d, union1d, setdiff1d
+    Use unique1d() to generate arrays with only unique elements to use as inputs
+    to this function. Alternatively, use intersect1d_nu() which will find the
+    unique values for you.
+
+    :Parameters:
+      - `ar1` : array
+      - `ar2` : array
+
+    :Returns:
+      - `intersection` : array
+
+    :See also:
+      numpy.lib.arraysetops has a number of other functions for performing set
+      operations on arrays.
     """
     aux = nm.concatenate((ar1,ar2))
     aux.sort()
@@ -91,10 +133,20 @@
 def intersect1d_nu( ar1, ar2 ):
     """Intersection of 1D arrays with any elements.
 
-    See also: ediff1d, unique1d, intersect1d, setxor1d,
-    setmember1d, union1d, setdiff1d
+    The input arrays do not have unique elements like intersect1d() requires.
+
+    :Parameters:
+      - `ar1` : array
+      - `ar2` : array
+
+    :Returns:
+      - `intersection` : array
+
+    :See also:
+      numpy.lib.arraysetops has a number of other functions for performing set
+      operations on arrays.
     """
-    # Might be faster then unique1d( intersect1d( ar1, ar2 ) )?
+    # Might be faster than unique1d( intersect1d( ar1, ar2 ) )?
     aux = nm.concatenate((unique1d(ar1), unique1d(ar2)))
     aux.sort()
     return aux[aux[1:] == aux[:-1]]
@@ -102,13 +154,25 @@
 def setxor1d( ar1, ar2 ):
     """Set exclusive-or of 1D arrays with unique elements.
 
-    See also: ediff1d, unique1d, intersect1d, intersect1d_nu,
-    setmember1d, union1d, setdiff1d
+    Use unique1d() to generate arrays with only unique elements to use as inputs
+    to this function.
+
+    :Parameters:
+      - `ar1` : array
+      - `ar2` : array
+
+    :Returns:
+      - `xor` : array
+        The values that are only in one, but not both, of the input arrays.
+
+    :See also:
+      numpy.lib.arraysetops has a number of other functions for performing set
+      operations on arrays.
     """
     aux = nm.concatenate((ar1, ar2))
     if aux.size == 0:
         return aux
-    
+
     aux.sort()
 #    flag = ediff1d( aux, to_end = 1, to_begin = 1 ) == 0
     flag = nm.concatenate( ([True], aux[1:] != aux[:-1], [True] ) )
@@ -117,16 +181,31 @@
     return aux[flag2]
 
 def setmember1d( ar1, ar2 ):
-    """Return an array of shape of ar1 containing 1 where the elements of
-    ar1 are in ar2 and 0 otherwise.
+    """Return a boolean array of shape of ar1 containing True where the elements
+    of ar1 are in ar2 and False otherwise.
 
-    See also: ediff1d, unique1d, intersect1d, intersect1d_nu, setxor1d,
-    union1d, setdiff1d
+    Use unique1d() to generate arrays with only unique elements to use as inputs
+    to this function.
+
+    :Parameters:
+      - `ar1` : array
+      - `ar2` : array
+
+    :Returns:
+      - `mask` : bool array
+        The values ar1[mask] are in ar2.
+
+    :See also:
+      numpy.lib.arraysetops has a number of other functions for performing set
+      operations on arrays.
     """
     zlike = nm.zeros_like
     ar = nm.concatenate( (ar1, ar2 ) )
     tt = nm.concatenate( (zlike( ar1 ), zlike( ar2 ) + 1) )
-    perm = ar.argsort()
+    # We need this to be a stable sort, so always use 'mergesort' here. The
+    # values from the first array should always come before the values from the
+    # second array.
+    perm = ar.argsort(kind='mergesort')
     aux = ar[perm]
     aux2 = tt[perm]
 #    flag = ediff1d( aux, 1 ) == 0
@@ -137,23 +216,46 @@
     perm[ii+1] = perm[ii]
     perm[ii] = aux
 
-    indx = perm.argsort()[:len( ar1 )]
+    indx = perm.argsort(kind='mergesort')[:len( ar1 )]
 
     return flag[indx]
 
 def union1d( ar1, ar2 ):
     """Union of 1D arrays with unique elements.
 
-    See also: ediff1d, unique1d, intersect1d, intersect1d_nu, setxor1d,
-    setmember1d, setdiff1d
+    Use unique1d() to generate arrays with only unique elements to use as inputs
+    to this function.
+
+    :Parameters:
+      - `ar1` : array
+      - `ar2` : array
+
+    :Returns:
+      - `union` : array
+
+    :See also:
+      numpy.lib.arraysetops has a number of other functions for performing set
+      operations on arrays.
     """
     return unique1d( nm.concatenate( (ar1, ar2) ) )
 
 def setdiff1d( ar1, ar2 ):
     """Set difference of 1D arrays with unique elements.
 
-    See also: ediff1d, unique1d, intersect1d, intersect1d_nu, setxor1d,
-    setmember1d, union1d
+    Use unique1d() to generate arrays with only unique elements to use as inputs
+    to this function.
+
+    :Parameters:
+      - `ar1` : array
+      - `ar2` : array
+
+    :Returns:
+      - `difference` : array
+        The values in ar1 that are not in ar2.
+
+    :See also:
+      numpy.lib.arraysetops has a number of other functions for performing set
+      operations on arrays.
     """
     aux = setmember1d(ar1,ar2)
     if aux.size == 0:
@@ -161,7 +263,7 @@
     else:
         return nm.asarray(ar1)[aux == 0]
 
-def test_unique1d_speed( plot_results = False ):
+def _test_unique1d_speed( plot_results = False ):
 #    exponents = nm.linspace( 2, 7, 9 )
     exponents = nm.linspace( 2, 7, 9 )
     ratios = []
@@ -222,4 +324,4 @@
         pylab.show()
 
 if (__name__ == '__main__'):
-    test_unique1d_speed( plot_results = True )
+    _test_unique1d_speed( plot_results = True )

Modified: branches/splitcode/numpy/lib/convdtype.py
===================================================================
--- branches/splitcode/numpy/lib/convdtype.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/lib/convdtype.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,6 +1,5 @@
 from tokenize import  generate_tokens
 import token
-from StringIO import StringIO
 import sys
 def insert(s1, s2, posn):
     """insert s1 into s2 at positions posn
@@ -17,6 +16,7 @@
 
 def insert_dtype(readline, output=None):
     """
+    >>> from StringIO import StringIO
     >>> src = "zeros((2,3), dtype=float); zeros((2,3));"
     >>> insert_dtype(StringIO(src).readline)
     zeros((2,3), dtype=float); zeros((2,3), dtype=int);
@@ -63,4 +63,3 @@
 
 if __name__ == "__main__":
     _test()
-        

Modified: branches/splitcode/numpy/lib/function_base.py
===================================================================
--- branches/splitcode/numpy/lib/function_base.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/lib/function_base.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -109,39 +109,39 @@
 
 def histogramdd(sample, bins=10, range=None, normed=False):
     """histogramdd(sample, bins = 10, range = None, normed = False) -> H, edges
-    
+
     Return the D-dimensional histogram computed from sample.
-    
+
     Parameters
     ----------
-    sample: A sequence of D arrays, or an NxD array. 
-    bins:   A sequence of edge arrays, or a sequence of the number of bins. 
+    sample: A sequence of D arrays, or an NxD array.
+    bins:   A sequence of edge arrays, or a sequence of the number of bins.
             If a scalar is given, it is assumed to be the number of bins
-            for all dimensions. 
+            for all dimensions.
     range:  A sequence of lower and upper bin edges (default: [min, max]).
-    normed: If False, returns the number of samples in each bin. 
+    normed: If False, returns the number of samples in each bin.
             If True, returns the frequency distribution.
-    
-    
+
+
     Output
     ------
     H:      Histogram array.
-    edges:  List of arrays defining the bin edges. 
-    
+    edges:  List of arrays defining the bin edges.
+
     Example:
     x = random.randn(100,3)
     H, edges = histogramdd(x, bins = (5, 6, 7))
-    
+
     See also: histogram
     """
-    
+
     try:
         N, D = sample.shape
     except (AttributeError, ValueError):
         ss = atleast_2d(sample)
         sample = ss.transpose()
         N, D = sample.shape
-    
+
     nbin = empty(D, int)
     edges = D*[None]
     dedges = D*[None]
@@ -152,7 +152,7 @@
             raise AttributeError, 'The dimension of bins must be a equal to the dimension of the sample x.'
     except TypeError:
         bins = D*[bins]
-        
+
     if range is None:
         smin = atleast_1d(sample.min(0))
         smax = atleast_1d(sample.max(0))
@@ -161,7 +161,7 @@
         smax = zeros(D)
         for i in arange(D):
             smin[i], smax[i] = range[i]
-    
+
     for i in arange(D):
         if isscalar(bins[i]):
             nbin[i] = bins[i]
@@ -169,18 +169,18 @@
         else:
             edges[i] = asarray(bins[i], float)
             nbin[i] = len(edges[i])-1
-            
 
 
+
     Ncount = {}
     nbin =  asarray(nbin)
 
     for i in arange(D):
-        Ncount[i] = digitize(sample[:,i], edges[i]) 
+        Ncount[i] = digitize(sample[:,i], edges[i])
         dedges[i] = diff(edges[i])
     # Remove values falling outside of bins
     # Values that fall on an edge are put in the right bin.
-    # For the rightmost bin, we want values equal to the right 
+    # For the rightmost bin, we want values equal to the right
     # edge to be counted in the last bin, and not as an outlier.
     outliers = zeros(N, int)
     for i in arange(D):
@@ -192,23 +192,23 @@
     for i in arange(D):
         Ncount[i] = Ncount[i][indices] - 1
     N = len(indices)
-    
+
     # Flattened histogram matrix (1D)
     hist = zeros(nbin.prod(), int)
-    
+
     # Compute the sample indices in the flattened histogram matrix.
     ni = nbin.argsort()
     shape = []
     xy = zeros(N, int)
     for i in arange(0, D-1):
         xy += Ncount[ni[i]] * nbin[ni[i+1:]].prod()
-        
+
     xy += Ncount[ni[-1]]
 
-    # Compute the number of repetitions in xy and assign it to the flattened histmat. 
+    # Compute the number of repetitions in xy and assign it to the flattened histmat.
     if len(xy) == 0:
         return zeros(nbin, int)
-        
+
     flatcount = bincount(xy)
     a = arange(len(flatcount))
     hist[a] = flatcount
@@ -219,7 +219,7 @@
         hist = hist.swapaxes(i,j)
         if (hist.shape == nbin).all():
             break
-    
+
     if normed:
         s = hist.sum()
         for i in arange(D):
@@ -227,10 +227,10 @@
             shape[i] = nbin[i]
             hist = hist / dedges[i].reshape(shape)
         hist /= s
-        
-    return hist, edges 
-    
 
+    return hist, edges
+
+
 def average(a, axis=None, weights=None, returned=False):
     """average(a, axis=None weights=None, returned=False)
 
@@ -639,7 +639,7 @@
 
 import sys
 if sys.hexversion < 0x2040000:
-   from sets import Set as set
+    from sets import Set as set
 
 def unique(x):
     """Return sorted unique items from an array or sequence.
@@ -777,7 +777,7 @@
     with the first element of the input.  This can be avoided by specifying
     the otypes argument as either a string of typecode characters or a list
     of data-types specifiers.  There should be one data-type specifier for
-    each output. 
+    each output.
 
   Input:
 
@@ -1054,7 +1054,7 @@
 
 def kaiser(M,beta):
     """kaiser(M, beta) returns a Kaiser window of length M with shape parameter
-    beta. 
+    beta.
     """
     from numpy.dual import i0
     n = arange(0,M)

Modified: branches/splitcode/numpy/lib/index_tricks.py
===================================================================
--- branches/splitcode/numpy/lib/index_tricks.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/lib/index_tricks.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -8,7 +8,6 @@
            'ndenumerate','ndindex']
 
 import sys
-import types
 import numpy.core.numeric as _nx
 from numpy.core.numeric import asarray, ScalarType, array
 
@@ -34,7 +33,7 @@
     """
     if x > _nx.prod(dims)-1 or x < 0:
         raise ValueError("Invalid index, must be 0 <= x <= number of elements.")
-        
+
     idx = _nx.empty_like(dims)
 
     # Take dimensions
@@ -275,7 +274,7 @@
                     newobj = array(newobj, copy=False, subok=True,
                                    ndmin=ndmin)
                     if trans1d != -1 and tempobj.ndim < ndmin:
-                        k2 = ndmin-tempobj.ndim                        
+                        k2 = ndmin-tempobj.ndim
                         if (trans1d < 0):
                             trans1d += k2 + 1
                         defaxes = range(ndmin)
@@ -319,8 +318,6 @@
 
 r_ = r_class()
 
-import warnings
-
 class c_class(concatenator):
     """Translates slice objects to concatenation along the second axis.
 

Modified: branches/splitcode/numpy/lib/polynomial.py
===================================================================
--- branches/splitcode/numpy/lib/polynomial.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/lib/polynomial.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -651,3 +651,4 @@
 
 warnings.simplefilter('always',RankWarning)
 
+    

Modified: branches/splitcode/numpy/lib/setup.py
===================================================================
--- branches/splitcode/numpy/lib/setup.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/lib/setup.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,16 +1,9 @@
-
-import imp
-import os
 from os.path import join
-from glob import glob
-from distutils.dep_util import newer,newer_group
 
 def configuration(parent_package='',top_path=None):
-    from numpy.distutils.misc_util import Configuration,dot_join
-    from numpy.distutils.system_info import get_info
+    from numpy.distutils.misc_util import Configuration
 
     config = Configuration('lib',parent_package,top_path)
-    local_dir = config.local_path
 
     config.add_include_dirs(join('..','core','include'))
 

Modified: branches/splitcode/numpy/lib/shape_base.py
===================================================================
--- branches/splitcode/numpy/lib/shape_base.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/lib/shape_base.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,6 +1,6 @@
 __all__ = ['atleast_1d','atleast_2d','atleast_3d','vstack','hstack',
            'column_stack','row_stack', 'dstack','array_split','split','hsplit',
-           'vsplit','dsplit','apply_over_axes','expand_dims', 
+           'vsplit','dsplit','apply_over_axes','expand_dims',
            'apply_along_axis', 'kron', 'tile', 'get_array_wrap']
 
 import numpy.core.numeric as _nx
@@ -31,7 +31,7 @@
     #  if res is a number, then we have a smaller output array
     if isscalar(res):
         outarr = zeros(outshape,asarray(res).dtype)
-        outarr[ind] = res
+        outarr[tuple(ind)] = res
         Ntot = product(outshape)
         k = 1
         while k < Ntot:
@@ -44,7 +44,7 @@
                 n -= 1
             i.put(indlist,ind)
             res = func1d(arr[tuple(i.tolist())],*args)
-            outarr[ind] = res
+            outarr[tuple(ind)] = res
             k += 1
         return outarr
     else:
@@ -249,7 +249,7 @@
             must have the same first dimension.  2D arrays are
             stacked as-is, just like with hstack.  1D arrays are turned
             into 2D columns first.
-            
+
         Arguments:
             tup -- sequence of 1D or 2D arrays.  All arrays must have the same
                    first dimension.
@@ -532,12 +532,12 @@
     In case of ties, leftmost wins. If no wrapper is found, return None
     """
     wrappers = [(getattr(x, '__array_priority__', 0), -i,
-                 x.__array_wrap__) for i, x in enumerate(args) 
+                 x.__array_wrap__) for i, x in enumerate(args)
                                    if hasattr(x, '__array_wrap__')]
     wrappers.sort()
     if wrappers:
         return wrappers[-1][-1]
-    return None 
+    return None
 
 def kron(a,b):
     """kronecker product of a and b
@@ -548,7 +548,7 @@
      [ a[m-1,0]*b, a[m-1,1]*b, ... , a[m-1,n-1]*b  ]]
     """
     wrapper = get_array_wrap(a, b)
-    b = asanyarray(b)    
+    b = asanyarray(b)
     a = array(a,copy=False,subok=True,ndmin=b.ndim)
     ndb, nda = b.ndim, a.ndim
     if (nda == 0 or ndb == 0):
@@ -565,10 +565,10 @@
             as_ = (1,)*(ndb-nda) + as_
         else:
             bs = (1,)*(nda-ndb) + bs
-            nd = nda        
+            nd = nda
     result = outer(a,b).reshape(as_+bs)
     axis = nd-1
-    for k in xrange(nd):
+    for _ in xrange(nd):
         result = concatenate(result, axis=axis)
     if wrapper is not None:
         result = wrapper(result)
@@ -626,4 +626,3 @@
         shape[i] = dim_out
         n /= dim_in
     return c.reshape(shape)
-

Modified: branches/splitcode/numpy/lib/tests/test_arraysetops.py
===================================================================
--- branches/splitcode/numpy/lib/tests/test_arraysetops.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/lib/tests/test_arraysetops.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -21,7 +21,7 @@
         ec = numpy.array( [1, 2, 5, 7] )
         c = unique1d( a )
         assert_array_equal( c, ec )
-        
+
         assert_array_equal([], unique1d([]))
 
     ##
@@ -34,7 +34,7 @@
         ec = numpy.array( [1, 2, 5] )
         c = intersect1d( a, b )
         assert_array_equal( c, ec )
-        
+
         assert_array_equal([], intersect1d([],[]))
 
     ##
@@ -47,7 +47,7 @@
         ec = numpy.array( [1, 2, 5] )
         c = intersect1d_nu( a, b )
         assert_array_equal( c, ec )
-        
+
         assert_array_equal([], intersect1d_nu([],[]))
 
     ##
@@ -74,14 +74,14 @@
         ec = numpy.array( [1, 2, 3, 4, 5, 6] )
         c = setxor1d( a, b )
         assert_array_equal( c, ec )
-        
+
         assert_array_equal([], setxor1d([],[]))
 
     def check_ediff1d(self):
         zero_elem = numpy.array([])
         one_elem = numpy.array([1])
         two_elem = numpy.array([1,2])
-        
+
         assert_array_equal([],ediff1d(zero_elem))
         assert_array_equal([0],ediff1d(zero_elem,to_begin=0))
         assert_array_equal([0],ediff1d(zero_elem,to_end=0))
@@ -109,7 +109,7 @@
         ec = numpy.array( [True, False, True, False] )
         c = setmember1d( a, b )
         assert_array_equal( c, ec )
-        
+
         assert_array_equal([], setmember1d([],[]))
 
     ##
@@ -122,7 +122,7 @@
         ec = numpy.array( [1, 2, 3, 4, 5, 7] )
         c = union1d( a, b )
         assert_array_equal( c, ec )
-        
+
         assert_array_equal([], union1d([],[]))
 
     ##
@@ -142,7 +142,7 @@
         ec = numpy.array( [19, 20] )
         c = setdiff1d( a, b )
         assert_array_equal( c, ec )
-        
+
         assert_array_equal([], setdiff1d([],[]))
 
 

Modified: branches/splitcode/numpy/lib/tests/test_function_base.py
===================================================================
--- branches/splitcode/numpy/lib/tests/test_function_base.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/lib/tests/test_function_base.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 import sys
 
 from numpy.testing import *
@@ -93,7 +92,7 @@
         t3 = linspace(0,1,2).dtype
         assert_equal(t1, t2)
         assert_equal(t2, t3)
-        
+
 class test_insert(NumpyTestCase):
     def check_basic(self):
         a = [1,2,3]
@@ -276,23 +275,23 @@
         f = vectorize(addsubtract)
         r = f([0,3,6,9],5)
         assert_array_equal(r,[5,8,1,4])
-    def check_large(self): 
-        x = linspace(-3,2,10000) 
-        f = vectorize(lambda x: x) 
-        y = f(x) 
-        assert_array_equal(y, x) 
+    def check_large(self):
+        x = linspace(-3,2,10000)
+        f = vectorize(lambda x: x)
+        y = f(x)
+        assert_array_equal(y, x)
 
 class test_digitize(NumpyTestCase):
     def check_forward(self):
 	x = arange(-6,5)
 	bins = arange(-5,5)
 	assert_array_equal(digitize(x,bins),arange(11))
-	
+
     def check_reverse(self):
 	x = arange(5,-6,-1)
 	bins = arange(5,-5,-1)
 	assert_array_equal(digitize(x,bins),arange(11))
-	
+
     def check_random(self):
 	x = rand(10)
 	bin = linspace(x.min(), x.max(), 10)
@@ -378,13 +377,13 @@
         # Check that a sequence of arrays is accepted and H has the correct shape.
         z = [squeeze(y) for y in split(x,3,axis=1)]
         H, edges = histogramdd(z, bins=(4,3,2),range=[[-2,2], [0,3], [0,2]])
-        answer = asarray([[[0,0],[0,0],[0,0]], 
-                          [[0,1], [0,0], [1,0]], 
-                          [[0,1], [0,0],[0,0]], 
+        answer = asarray([[[0,0],[0,0],[0,0]],
+                          [[0,1], [0,0], [1,0]],
+                          [[0,1], [0,0],[0,0]],
                           [[0,0],[0,0],[0,0]]])
         assert_array_equal(H, answer)
-                
 
+
 class test_unique(NumpyTestCase):
     def check_simple(self):
         x = array([4,3,2,1,1,2,3,4, 0])

Modified: branches/splitcode/numpy/lib/tests/test_index_tricks.py
===================================================================
--- branches/splitcode/numpy/lib/tests/test_index_tricks.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/lib/tests/test_index_tricks.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 from numpy.testing import *
 set_package_path()
 from numpy import array, ones, r_, mgrid

Modified: branches/splitcode/numpy/lib/tests/test_polynomial.py
===================================================================
--- branches/splitcode/numpy/lib/tests/test_polynomial.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/lib/tests/test_polynomial.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -78,7 +78,7 @@
 
 class test_docs(NumpyTestCase):
     def check_doctests(self): return self.rundocs()
-    
+
     def check_roots(self):
         assert_array_equal(N.roots([1,0,0]), [0,0])
 

Modified: branches/splitcode/numpy/lib/tests/test_shape_base.py
===================================================================
--- branches/splitcode/numpy/lib/tests/test_shape_base.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/lib/tests/test_shape_base.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 from numpy.testing import *
 set_package_path()
 import numpy.lib;
@@ -14,6 +13,10 @@
         a = ones((10,101),'d')
         assert_array_equal(apply_along_axis(len,0,a),len(a)*ones(shape(a)[1]))
 
+    def check_3d(self):
+        a = arange(27).reshape((3,3,3))
+        assert_array_equal(apply_along_axis(sum,0,a), [[27,30,33],[36,39,42],[45,48,51]])
+
 class test_array_split(NumpyTestCase):
     def check_integer_0_split(self):
         a = arange(10)
@@ -356,17 +359,17 @@
     def check_return_type(self):
         a = ones([2,2])
         m = asmatrix(a)
-        assert_equal(type(kron(a,a)), ndarray) 
-        assert_equal(type(kron(m,m)), matrix) 
-        assert_equal(type(kron(a,m)), matrix) 
-        assert_equal(type(kron(m,a)), matrix) 
-        class myarray(ndarray): 
+        assert_equal(type(kron(a,a)), ndarray)
+        assert_equal(type(kron(m,m)), matrix)
+        assert_equal(type(kron(a,m)), matrix)
+        assert_equal(type(kron(m,a)), matrix)
+        class myarray(ndarray):
             __array_priority__ = 0.0
         ma = myarray(a.shape, a.dtype, a.data)
-        assert_equal(type(kron(a,a)), ndarray) 
-        assert_equal(type(kron(ma,ma)), myarray) 
-        assert_equal(type(kron(a,ma)), ndarray) 
-        assert_equal(type(kron(ma,a)), myarray) 
+        assert_equal(type(kron(a,a)), ndarray)
+        assert_equal(type(kron(ma,ma)), myarray)
+        assert_equal(type(kron(a,ma)), ndarray)
+        assert_equal(type(kron(ma,a)), myarray)
 
 
 class test_tile(NumpyTestCase):
@@ -378,11 +381,12 @@
         assert_equal(tile(a,(1,2)), [[0,1,2,0,1,2]])
         assert_equal(tile(b, 2), [[1,2,1,2],[3,4,3,4]])
         assert_equal(tile(b,(2,1)),[[1,2],[3,4],[1,2],[3,4]])
-        assert_equal(tile(b,(2,2)),[[1,2,1,2],[3,4,3,4],[1,2,1,2],[3,4,3,4]])
+        assert_equal(tile(b,(2,2)),[[1,2,1,2],[3,4,3,4],
+                                    [1,2,1,2],[3,4,3,4]])
 
     def check_kroncompare(self):
         import numpy.random as nr
-	reps=[(2,),(1,2),(2,1),(2,2),(2,3,2),(3,2)]
+        reps=[(2,),(1,2),(2,1),(2,2),(2,3,2),(3,2)]
         shape=[(3,),(2,3),(3,4,3),(3,2,3),(4,3,2,4),(2,2)]
         for s in shape:
             b = nr.randint(0,10,size=s)
@@ -401,3 +405,4 @@
 
 if __name__ == "__main__":
     NumpyTest().run()
+ 

Modified: branches/splitcode/numpy/lib/tests/test_twodim_base.py
===================================================================
--- branches/splitcode/numpy/lib/tests/test_twodim_base.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/lib/tests/test_twodim_base.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -162,12 +162,12 @@
         assert_array_almost_equal(H, answer/8., 3)
     def check_norm(self):
         x = array([1,2,3,1,2,3,1,2,3])
-        y = array([1,1,1,2,2,2,3,3,3]) 
+        y = array([1,1,1,2,2,2,3,3,3])
         H, xed, yed = histogram2d(x,y,[[1,2,3,5], [1,2,3,5]], normed=True)
         answer=array([[1,1,.5],
                      [1,1,.5],
                      [.5,.5,.25]])/9.
         assert_array_almost_equal(H, answer, 3)
-        
+
 if __name__ == "__main__":
     NumpyTest().run()

Modified: branches/splitcode/numpy/lib/tests/test_type_check.py
===================================================================
--- branches/splitcode/numpy/lib/tests/test_type_check.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/lib/tests/test_type_check.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 import sys
 
 from numpy.testing import *

Modified: branches/splitcode/numpy/lib/twodim_base.py
===================================================================
--- branches/splitcode/numpy/lib/twodim_base.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/lib/twodim_base.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -5,7 +5,7 @@
 __all__ = ['diag','diagflat','eye','fliplr','flipud','rot90','tri','triu',
            'tril','vander','histogram2d']
 
-from numpy.core.numeric import asanyarray, int_, equal, subtract, arange, \
+from numpy.core.numeric import asanyarray, equal, subtract, arange, \
      zeros, arange, greater_equal, multiply, ones, asarray
 
 def fliplr(m):
@@ -50,7 +50,7 @@
         return m.astype(dtype)
 
 def diag(v, k=0):
-    """ returns a copy of the the k-th diagonal if v is a 2-d array 
+    """ returns a copy of the the k-th diagonal if v is a 2-d array
         or returns a 2-d array with v as the k-th diagonal if v is a
         1-d array.
     """
@@ -100,7 +100,7 @@
     if not wrap:
         return res
     return wrap(res)
-    
+
 def tri(N, M=None, k=0, dtype=float):
     """ returns a N-by-M array where all the diagonals starting from
         lower left corner up to the k-th are all ones.
@@ -108,7 +108,7 @@
     if M is None: M = N
     m = greater_equal(subtract.outer(arange(N), arange(M)),-k)
     if m.dtype != dtype:
-        return m.astype(dtype)    
+        return m.astype(dtype)
 
 def tril(m, k=0):
     """ returns the elements on and below the k-th diagonal of m.  k=0 is the
@@ -145,20 +145,20 @@
 
 def histogram2d(x,y, bins=10, range=None, normed=False):
     """histogram2d(x,y, bins=10, range=None, normed=False) -> H, xedges, yedges
-    
-    Compute the 2D histogram from samples x,y. 
 
+    Compute the 2D histogram from samples x,y.
+
     Parameters
     ----------
     x,y: 1D data series. Both arrays must have the same length.
-    bins: Number of bins -or- [nbin x, nbin y] -or- 
+    bins: Number of bins -or- [nbin x, nbin y] -or-
          [bin edges] -or- [x bin edges, y bin edges].
     range:  A sequence of lower and upper bin edges (default: [min, max]).
-    normed: True or False. 
-    
-    The histogram array is a count of the number of samples in each 
-    two dimensional bin. 
-    Setting normed to True returns a density rather than a bin count. 
+    normed: True or False.
+
+    The histogram array is a count of the number of samples in each
+    two dimensional bin.
+    Setting normed to True returns a density rather than a bin count.
     """
     import numpy as np
     try:
@@ -196,19 +196,19 @@
         xedges = yedges.copy()
         ynbin = len(yedges)-1
         xnbin = len(xedges)-1
-    
+
     dxedges = np.diff(xedges)
     dyedges = np.diff(yedges)
-    
+
     # Flattened histogram matrix (1D)
     hist = np.zeros((xnbin)*(ynbin), int)
 
     # Count the number of sample in each bin (1D)
-    xbin = np.digitize(x,xedges) 
-    ybin = np.digitize(y,yedges) 
- 
+    xbin = np.digitize(x,xedges)
+    ybin = np.digitize(y,yedges)
+
     # Values that fall on an edge are put in the right bin.
-    # For the rightmost bin, we want values equal to the right 
+    # For the rightmost bin, we want values equal to the right
     # edge to be counted in the last bin, and not as an outlier.
     xdecimal = int(-np.log10(dxedges.min()))+6
     ydecimal = int(-np.log10(dyedges.min()))+6
@@ -220,15 +220,15 @@
     outliers = (xbin==0) | (xbin==xnbin+1) | (ybin==0) | (ybin == ynbin+1)
     xbin = xbin[outliers==False] - 1
     ybin = ybin[outliers==False] - 1
-    
+
     # Compute the sample indices in the flattened histogram matrix.
     if xnbin >= ynbin:
         xy = ybin*(xnbin) + xbin
-        
+
     else:
         xy = xbin*(ynbin) + ybin
-        
-       
+
+
     # Compute the number of repetitions in xy and assign it to the flattened
     #  histogram matrix.
 

Modified: branches/splitcode/numpy/lib/type_check.py
===================================================================
--- branches/splitcode/numpy/lib/type_check.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/lib/type_check.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -104,10 +104,14 @@
     return f.max, f.min
 
 def nan_to_num(x):
-    # mapping:
-    #    NaN -> 0
-    #    Inf -> limits.double_max
-    #   -Inf -> limits.double_min
+    """
+    Replaces NaN's with 0 and infinities with large numbers
+
+    The following mappings are applied:
+        NaN -> 0
+        Inf -> limits.double_max
+       -Inf -> limits.double_min
+    """
     try:
         t = x.dtype.type
     except AttributeError:

Modified: branches/splitcode/numpy/lib/user_array.py
===================================================================
--- branches/splitcode/numpy/lib/user_array.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/lib/user_array.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -196,7 +196,7 @@
         return self.array.__getattribute__(attr)
 
 #############################################################
-# Test of class container 
+# Test of class container
 #############################################################
 if __name__ == '__main__':
     temp=reshape(arange(10000),(100,100))

Modified: branches/splitcode/numpy/lib/utils.py
===================================================================
--- branches/splitcode/numpy/lib/utils.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/lib/utils.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,13 +1,13 @@
-import sys, os
+import sys
 import inspect
 import types
-from numpy.core.numerictypes import obj2sctype, integer, generic
-from numpy.core.multiarray import dtype as _dtype, _flagdict, flagsobj
+from numpy.core.numerictypes import obj2sctype, generic
+from numpy.core.multiarray import dtype as _dtype
 from numpy.core import product, ndarray
 
 __all__ = ['issubclass_', 'get_numpy_include', 'issubsctype',
            'issubdtype', 'deprecate', 'get_numarray_include',
-	   'get_include', 'info', 'source', 'who']
+           'get_include', 'info', 'source', 'who']
 
 def issubclass_(arg1, arg2):
     try:
@@ -195,7 +195,7 @@
 # Traverse all module directories underneath globals
 # to see if something is defined
 def _makenamedict(module='numpy'):
-    module = __import__(module, globals(), locals(), []) 
+    module = __import__(module, globals(), locals(), [])
     thedict = {module.__name__:module.__dict__}
     dictlist = [module.__name__]
     totraverse = [module.__dict__]
@@ -373,4 +373,3 @@
         print >> output,  inspect.getsource(object)
     except:
         print >> output,  "Not available for this object."
-

Modified: branches/splitcode/numpy/linalg/info.py
===================================================================
--- branches/splitcode/numpy/linalg/info.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/linalg/info.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -4,7 +4,7 @@
 
  Linear Algebra Basics:
 
-   norm       --- Vector or matrix norm 
+   norm       --- Vector or matrix norm
    inv        --- Inverse of a square matrix
    solve      --- Solve a linear system of equations
    det        --- Determinant of a square matrix

Modified: branches/splitcode/numpy/linalg/linalg.py
===================================================================
--- branches/splitcode/numpy/linalg/linalg.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/linalg/linalg.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -20,8 +20,8 @@
         intc, single, double, csingle, cdouble, inexact, complexfloating, \
         newaxis, ravel, all, Inf, dot, add, multiply, identity, sqrt, \
         maximum, flatnonzero, diagonal, arange, fastCopyAndTranspose, sum, \
-        argsort, isfinite
-from numpy.lib import triu, iterable
+        isfinite
+from numpy.lib import triu
 from numpy.linalg import lapack_lite
 
 fortran_int = intc
@@ -113,7 +113,8 @@
 def _assertRank2(*arrays):
     for a in arrays:
         if len(a.shape) != 2:
-            raise LinAlgError, 'Array must be two-dimensional'
+            raise LinAlgError, '%d-dimensional array given. Array must be \
+            two-dimensional' % len(a.shape)
 
 def _assertSquareness(*arrays):
     for a in arrays:
@@ -141,7 +142,7 @@
     an = a.ndim
 
     if axes is not None:
-        allaxes = range(0,an)
+        allaxes = range(0, an)
         for k in axes:
             allaxes.remove(k)
             allaxes.insert(an, k)
@@ -152,7 +153,7 @@
     for k in oldshape:
         prod *= k
 
-    a = a.reshape(-1,prod)
+    a = a.reshape(-1, prod)
     b = b.ravel()
     res = solve(a, b)
     res.shape = oldshape
@@ -228,7 +229,7 @@
             prod *= k
     else:
         raise ValueError, "Invalid ind argument."
-    a = a.reshape(prod,-1)
+    a = a.reshape(prod, -1)
     ia = inv(a)
     return ia.reshape(*invshape)
 
@@ -254,7 +255,8 @@
         lapack_routine = lapack_lite.dpotrf
     results = lapack_routine('L', n, a, m, 0)
     if results['info'] > 0:
-        raise LinAlgError, 'Matrix is not positive definite - Cholesky decomposition cannot be computed'
+        raise LinAlgError, 'Matrix is not positive definite - \
+        Cholesky decomposition cannot be computed'
     s = triu(a, k=0).transpose()
     if (s.dtype != result_t):
         return s.astype(result_t)
@@ -271,10 +273,10 @@
                    part of A2 is R. This is faster if you only need R
     """
     _assertRank2(a)
-    m,n = a.shape
+    m, n = a.shape
     t, result_t = _commonType(a)
     a = _fastCopyAndTranspose(t, a)
-    mn = min(m,n)
+    mn = min(m, n)
     tau = zeros((mn,), t)
     if isComplexType(t):
         lapack_routine = lapack_lite.zgeqrf
@@ -286,20 +288,20 @@
     # calculate optimal size of work data 'work'
     lwork = 1
     work = zeros((lwork,), t)
-    results=lapack_routine(m, n, a, m, tau, work, -1, 0)
+    results = lapack_routine(m, n, a, m, tau, work, -1, 0)
     if results['info'] != 0:
         raise LinAlgError, '%s returns %d' % (routine_name, results['info'])
 
     # do qr decomposition
     lwork = int(abs(work[0]))
-    work = zeros((lwork,),t)
-    results=lapack_routine(m, n, a, m, tau, work, lwork, 0)
+    work = zeros((lwork,), t)
+    results = lapack_routine(m, n, a, m, tau, work, lwork, 0)
 
     if results['info'] != 0:
         raise LinAlgError, '%s returns %d' % (routine_name, results['info'])
 
     #  economic mode. Isn't actually economic.
-    if mode[0]=='e':
+    if mode[0] == 'e':
         if t != result_t :
             a = a.astype(result_t)
         return a.T
@@ -310,7 +312,7 @@
         r[i,:i].fill(0.0)
 
     #  'r'-mode, that is, calculate only r
-    if mode[0]=='r':
+    if mode[0] == 'r':
         return r
 
     #  from here on: build orthonormal matrix q from a
@@ -324,21 +326,21 @@
 
     # determine optimal lwork
     lwork = 1
-    work=zeros((lwork,), t)
-    results=lapack_routine(m,mn,mn, a, m, tau, work, -1, 0)
+    work = zeros((lwork,), t)
+    results = lapack_routine(m, mn, mn, a, m, tau, work, -1, 0)
     if results['info'] != 0:
         raise LinAlgError, '%s returns %d' % (routine_name, results['info'])
 
     # compute q
     lwork = int(abs(work[0]))
-    work=zeros((lwork,), t)
-    results=lapack_routine(m,mn,mn, a, m, tau, work, lwork, 0)
+    work = zeros((lwork,), t)
+    results = lapack_routine(m, mn, mn, a, m, tau, work, lwork, 0)
     if results['info'] != 0:
         raise LinAlgError, '%s returns %d' % (routine_name, results['info'])
 
     q = _fastCopyAndTranspose(result_t, a[:mn,:])
 
-    return q,r
+    return q, r
 
 
 # Eigenvalues
@@ -401,13 +403,13 @@
         lwork = 1
         work = zeros((lwork,), t)
         lrwork = 1
-        rwork = zeros((lrwork,),real_t)
+        rwork = zeros((lrwork,), real_t)
         results = lapack_routine('N', UPLO, n, a, n, w, work, -1,
                                  rwork, -1, iwork, liwork,  0)
         lwork = int(abs(work[0]))
         work = zeros((lwork,), t)
         lrwork = int(rwork[0])
-        rwork = zeros((lrwork,),real_t)
+        rwork = zeros((lrwork,), real_t)
         results = lapack_routine('N', UPLO, n, a, n, w, work, lwork,
                                 rwork, lrwork, iwork, liwork,  0)
     else:
@@ -449,27 +451,27 @@
         # Complex routines take different arguments
         lapack_routine = lapack_lite.zgeev
         w = zeros((n,), t)
-        v = zeros((n,n), t)
+        v = zeros((n, n), t)
         lwork = 1
-        work = zeros((lwork,),t)
-        rwork = zeros((2*n,),real_t)
+        work = zeros((lwork,), t)
+        rwork = zeros((2*n,), real_t)
         results = lapack_routine('N', 'V', n, a, n, w,
                                  dummy, 1, v, n, work, -1, rwork, 0)
         lwork = int(abs(work[0]))
-        work = zeros((lwork,),t)
+        work = zeros((lwork,), t)
         results = lapack_routine('N', 'V', n, a, n, w,
                                  dummy, 1, v, n, work, lwork, rwork, 0)
     else:
         lapack_routine = lapack_lite.dgeev
         wr = zeros((n,), t)
         wi = zeros((n,), t)
-        vr = zeros((n,n), t)
+        vr = zeros((n, n), t)
         lwork = 1
-        work = zeros((lwork,),t)
+        work = zeros((lwork,), t)
         results = lapack_routine('N', 'V', n, a, n, wr, wi,
                                   dummy, 1, vr, n, work, -1, 0)
         lwork = int(work[0])
-        work = zeros((lwork,),t)
+        work = zeros((lwork,), t)
         results = lapack_routine('N', 'V', n, a, n, wr, wi,
                                   dummy, 1, vr, n, work, lwork, 0)
         if all(wi == 0.0):
@@ -508,25 +510,25 @@
         lwork = 1
         work = zeros((lwork,), t)
         lrwork = 1
-        rwork = zeros((lrwork,),real_t)
-        results = lapack_routine('V', UPLO, n, a, n,w, work, -1,
+        rwork = zeros((lrwork,), real_t)
+        results = lapack_routine('V', UPLO, n, a, n, w, work, -1,
                                  rwork, -1, iwork, liwork,  0)
         lwork = int(abs(work[0]))
         work = zeros((lwork,), t)
         lrwork = int(rwork[0])
         rwork = zeros((lrwork,), real_t)
-        results = lapack_routine('V', UPLO, n, a, n,w, work, lwork,
+        results = lapack_routine('V', UPLO, n, a, n, w, work, lwork,
                                  rwork, lrwork, iwork, liwork,  0)
     else:
         lapack_routine = lapack_lite.dsyevd
         w = zeros((n,), t)
         lwork = 1
-        work = zeros((lwork,),t)
-        results = lapack_routine('V', UPLO, n, a, n,w, work, -1,
+        work = zeros((lwork,), t)
+        results = lapack_routine('V', UPLO, n, a, n, w, work, -1,
                 iwork, liwork, 0)
         lwork = int(work[0])
-        work = zeros((lwork,),t)
-        results = lapack_routine('V', UPLO, n, a, n,w, work, lwork,
+        work = zeros((lwork,), t)
+        results = lapack_routine('V', UPLO, n, a, n, w, work, lwork,
                 iwork, liwork, 0)
     if results['info'] > 0:
         raise LinAlgError, 'Eigenvalues did not converge'
@@ -559,15 +561,15 @@
     t, result_t = _commonType(a)
     real_t = _linalgRealType(t)
     a = _fastCopyAndTranspose(t, a)
-    s = zeros((min(n,m),), real_t)
+    s = zeros((min(n, m),), real_t)
     if compute_uv:
         if full_matrices:
             nu = m
             nvt = n
             option = 'A'
         else:
-            nu = min(n,m)
-            nvt = min(n,m)
+            nu = min(n, m)
+            nvt = min(n, m)
             option = 'S'
         u = zeros((nu, m), t)
         vt = zeros((n, nvt), t)
@@ -575,13 +577,13 @@
         option = 'N'
         nu = 1
         nvt = 1
-        u = empty((1,1), t)
-        vt = empty((1,1), t)
+        u = empty((1, 1), t)
+        vt = empty((1, 1), t)
 
-    iwork = zeros((8*min(m,n),), fortran_int)
+    iwork = zeros((8*min(m, n),), fortran_int)
     if isComplexType(t):
         lapack_routine = lapack_lite.zgesdd
-        rwork = zeros((5*min(m,n)*min(m,n) + 5*min(m,n),), real_t)
+        rwork = zeros((5*min(m, n)*min(m, n) + 5*min(m, n),), real_t)
         lwork = 1
         work = zeros((lwork,), t)
         results = lapack_routine(option, m, n, a, m, s, u, m, vt, nvt,
@@ -625,7 +627,7 @@
     m = u.shape[0]
     n = vt.shape[1]
     cutoff = rcond*maximum.reduce(s)
-    for i in range(min(n,m)):
+    for i in range(min(n, m)):
         if s[i] > cutoff:
             s[i] = 1./s[i]
         else:
@@ -655,7 +657,7 @@
     elif (info > 0):
         return 0.0
     sign = add.reduce(pivots != arange(1, n+1)) % 2
-    return (1.-2.*sign)*multiply.reduce(diagonal(a),axis=-1)
+    return (1.-2.*sign)*multiply.reduce(diagonal(a), axis=-1)
 
 # Linear Least Squares
 
@@ -682,28 +684,28 @@
     m  = a.shape[0]
     n  = a.shape[1]
     n_rhs = b.shape[1]
-    ldb = max(n,m)
+    ldb = max(n, m)
     if m != b.shape[0]:
         raise LinAlgError, 'Incompatible dimensions'
     t, result_t = _commonType(a, b)
     real_t = _linalgRealType(t)
-    bstar = zeros((ldb,n_rhs),t)
+    bstar = zeros((ldb, n_rhs), t)
     bstar[:b.shape[0],:n_rhs] = b.copy()
     a, bstar = _fastCopyAndTranspose(t, a, bstar)
-    s = zeros((min(m,n),),real_t)
-    nlvl = max( 0, int( math.log( float(min( m,n ))/2. ) ) + 1 )
-    iwork = zeros((3*min(m,n)*nlvl+11*min(m,n),), fortran_int)
+    s = zeros((min(m, n),), real_t)
+    nlvl = max( 0, int( math.log( float(min(m, n))/2. ) ) + 1 )
+    iwork = zeros((3*min(m, n)*nlvl+11*min(m, n),), fortran_int)
     if isComplexType(t):
         lapack_routine = lapack_lite.zgelsd
         lwork = 1
         rwork = zeros((lwork,), real_t)
-        work = zeros((lwork,),t)
+        work = zeros((lwork,), t)
         results = lapack_routine(m, n, n_rhs, a, m, bstar, ldb, s, rcond,
                                  0, work, -1, rwork, iwork, 0)
         lwork = int(abs(work[0]))
-        rwork = zeros((lwork,),real_t)
-        a_real = zeros((m,n),real_t)
-        bstar_real = zeros((ldb,n_rhs,),real_t)
+        rwork = zeros((lwork,), real_t)
+        a_real = zeros((m, n), real_t)
+        bstar_real = zeros((ldb, n_rhs,), real_t)
         results = lapack_lite.dgelsd(m, n, n_rhs, a_real, m,
                                      bstar_real, ldb, s, rcond,
                                      0, rwork, -1, iwork, 0)
@@ -727,13 +729,13 @@
     resids = array([], t)
     if one_eq:
         x = array(ravel(bstar)[:n], dtype=result_t, copy=True)
-        if results['rank']==n and m>n:
+        if results['rank'] == n and m > n:
             resids = array([sum((ravel(bstar)[n:])**2)], dtype=result_t)
     else:
         x = array(transpose(bstar)[:n,:], dtype=result_t, copy=True)
-        if results['rank']==n and m>n:
-            resids = sum((transpose(bstar)[n:,:])**2,axis=0).astype(result_t)
-    st = s[:min(n,m)].copy().astype(_realType(result_t))
+        if results['rank'] == n and m > n:
+            resids = sum((transpose(bstar)[n:,:])**2, axis=0).astype(result_t)
+    st = s[:min(n, m)].copy().astype(_realType(result_t))
     return wrap(x), resids, results['rank'], st
 
 def norm(x, ord=None):
@@ -786,9 +788,9 @@
             return ((abs(x)**ord).sum())**(1.0/ord)
     elif nd == 2:
         if ord == 2:
-            return svd(x,compute_uv=0).max()
+            return svd(x, compute_uv=0).max()
         elif ord == -2:
-            return svd(x,compute_uv=0).min()
+            return svd(x, compute_uv=0).min()
         elif ord == 1:
             return abs(x).sum(axis=0).max()
         elif ord == Inf:

Modified: branches/splitcode/numpy/linalg/setup.py
===================================================================
--- branches/splitcode/numpy/linalg/setup.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/linalg/setup.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,6 +1,4 @@
 
-from os.path import join
-
 def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration
     from numpy.distutils.system_info import get_info

Modified: branches/splitcode/numpy/matlib.py
===================================================================
--- branches/splitcode/numpy/matlib.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/matlib.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -12,7 +12,7 @@
     """return an empty matrix of the given shape
     """
     return ndarray.__new__(matrix, shape, dtype, order=order)
-        
+
 def ones(shape, dtype=None, order='C'):
     """return a matrix initialized to all ones
     """
@@ -23,7 +23,7 @@
 def zeros(shape, dtype=None, order='C'):
     """return a matrix initialized to all zeros
     """
-    a = ndarray.__new__(matrix, shape, dtype, order=order)    
+    a = ndarray.__new__(matrix, shape, dtype, order=order)
     a.fill(0)
     return a
 

Modified: branches/splitcode/numpy/numarray/alter_code1.py
===================================================================
--- branches/splitcode/numpy/numarray/alter_code1.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/numarray/alter_code1.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -50,7 +50,7 @@
    - .setimag() --> .imag =
    - .getimaginary() --> .imag
    - .setimaginary() --> .imag
-   
+
 """
 __all__ = ['convertfile', 'convertall', 'converttree', 'convertsrc']
 
@@ -111,14 +111,14 @@
     astr = astr.replace(".is_fortran_contiguous()",".flags.fortran")
     astr = astr.replace(".itemsize()",".itemsize")
     astr = astr.replace(".size()",".size")
-    astr = astr.replace(".nelements()",".size")    
+    astr = astr.replace(".nelements()",".size")
     astr = astr.replace(".typecode()",".dtype.char")
     astr = astr.replace(".stddev()",".std()")
     astr = astr.replace(".getshape()", ".shape")
     astr = astr.replace(".getflat()", ".ravel()")
     astr = astr.replace(".getreal", ".real")
     astr = astr.replace(".getimag", ".imag")
-    astr = astr.replace(".getimaginary", ".imag")            
+    astr = astr.replace(".getimaginary", ".imag")
 
     # preserve uses of flat that should be o.k.
     tmpstr = flatindex_re.sub(r"@@@@\2",astr)
@@ -161,9 +161,9 @@
     astr = setshape_re.sub('\\1.shape = \\2', astr)
     astr = setreal_re.sub('\\1.real = \\2', astr)
     astr = setimag_re.sub('\\1.imag = \\2', astr)
-    astr = setimaginary_re.sub('\\1.imag = \\2', astr)    
+    astr = setimaginary_re.sub('\\1.imag = \\2', astr)
     return astr
-    
+
 import datetime
 def fromstr(filestr):
     savestr = filestr[:]
@@ -249,7 +249,7 @@
             else:
                 os.remove(afile)
             makenewfile(afile, fstr)
-                
+
 def _func(arg, dirname, fnames):
     convertall(dirname, orig=0)
     convertsrc(dirname, ['h','c'], orig=0)

Modified: branches/splitcode/numpy/numarray/alter_code2.py
===================================================================
--- branches/splitcode/numpy/numarray/alter_code2.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/numarray/alter_code2.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -2,7 +2,7 @@
 This module converts code written for numpy.numarray to work
 with numpy
 
-FIXME:  finish this. 
+FIXME:  finish this.
 
 """
 #__all__ = ['convertfile', 'convertall', 'converttree']

Modified: branches/splitcode/numpy/numarray/convolve.py
===================================================================
--- branches/splitcode/numpy/numarray/convolve.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/numarray/convolve.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -10,5 +10,5 @@
 It can be downloaded by checking out the latest source from
 http://svn.scipy.org/svn/scipy/trunk/Lib/stsci or by downloading and
 installing all of SciPy from http://www.scipy.org.
-"""      
+"""
         raise ImportError(msg)

Modified: branches/splitcode/numpy/numarray/functions.py
===================================================================
--- branches/splitcode/numpy/numarray/functions.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/numarray/functions.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 # missing Numarray defined names (in from numarray import *)
 ##__all__ = ['ClassicUnpickler', 'Complex32_fromtype',
 ##           'Complex64_fromtype', 'ComplexArray', 'Error',
@@ -8,7 +7,7 @@
 ##           'PyINT_TYPES', 'PyLevel2Type', 'PyNUMERIC_TYPES', 'PyREAL_TYPES',
 ##           'SUPPRESS_SMALL',
 ##           'SuitableBuffer', 'USING_BLAS',
-##           'UsesOpPriority', 
+##           'UsesOpPriority',
 ##           'codegenerator', 'generic', 'libnumarray', 'libnumeric',
 ##           'make_ufuncs', 'memory',
 ##           'numarrayall', 'numarraycore', 'numinclude', 'safethread',
@@ -72,7 +71,7 @@
 
 def fromfunction(shape, dimensions, type=None, typecode=None, dtype=None):
     dtype = type2dtype(typecode, type, dtype, 1)
-    return N.fromfunction(shape, dimensions, dtype=dtype)    
+    return N.fromfunction(shape, dimensions, dtype=dtype)
 def ones(shape, type=None, typecode=None, dtype=None):
     dtype = type2dtype(typecode, type, dtype, 1)
     return N.ones(shape, dtype)
@@ -90,7 +89,7 @@
         out[...] = arr
         return out
     return arr
-    
+
 def indices(shape, type=None):
     return N.indices(shape, type)
 
@@ -118,7 +117,7 @@
     if output is None:
         return ret
     return
-    
+
 def array2list(arr):
     return arr.tolist()
 
@@ -174,7 +173,7 @@
         shape = (-1,)
     if not isinstance(shape, tuple):
         shape = (shape,)
-        
+
     if (list(shape).count(-1)>1):
         raise ValueError("At most one unspecified dimension in shape")
 
@@ -208,7 +207,7 @@
     ##the most common case, namely reading in data from an unchanging
     ##file whose size may be determined before allocation, should be
     ##quick -- only one allocation will be needed.
-    
+
     recsize = dtype.itemsize * N.product([i for i in shape if i != -1])
     blocksize = max(_BLOCKSIZE/recsize, 1)*recsize
 
@@ -265,7 +264,7 @@
     if a.dtype.char == '?':
         N.not_equal(a, 0, a)
     return a
-    
+
 def fromstring(datastring, type=None, shape=None, typecode=None, dtype=None):
     dtype = type2dtype(typecode, type, dtype, True)
     if shape is None:
@@ -275,7 +274,7 @@
     res = N.fromstring(datastring, count=count)
     if shape is not None:
         res.shape = shape
-    return res                
+    return res
 
 
 # check_overflow is ignored
@@ -333,12 +332,12 @@
         if not issubclass(dummy.dtype.type, N.integer):
             raise TypeError
         if len(dummy) > N.MAXDIMS:
-            raise TypeError        
+            raise TypeError
     except:
         raise TypeError("Shape must be a sequence of integers")
     return shape
 
-    
+
 def identity(n, type=None, typecode=None, dtype=None):
     dtype = type2dtype(typecode, type, dtype, True)
     return N.identity(n, dtype)
@@ -455,8 +454,8 @@
         if outarr is None:
             return res
         out[...] = res
-        return 
-    
+        return
+
 def tensormultiply(a1, a2):
     a1, a2 = N.asarray(a1), N.asarray(a2)
     if (a1.shape[-1] != a2.shape[0]):

Modified: branches/splitcode/numpy/numarray/image.py
===================================================================
--- branches/splitcode/numpy/numarray/image.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/numarray/image.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -12,4 +12,4 @@
 installing all of SciPy from http://www.scipy.org.
 """
         raise ImportError(msg)
-                                 
+

Modified: branches/splitcode/numpy/numarray/numerictypes.py
===================================================================
--- branches/splitcode/numpy/numarray/numerictypes.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/numarray/numerictypes.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -118,7 +118,7 @@
             self.default = None
             self.typeno = -1
             return self
-            
+
     def __init__(self, name, bytes, default, typeno):
         if not isinstance(name, str):
             raise TypeError("name must be a string")
@@ -159,7 +159,7 @@
 
 class FloatingType(NumericType):
     pass
-        
+
 class ComplexType(NumericType):
     pass
 
@@ -174,7 +174,7 @@
 Any = AnyType("Any", None, None, _tAny)
 
 Object = ObjectType("Object", None, None, _tObject)
-    
+
 # Numeric Types:
 
 Bool  = BooleanType("Bool", 1, 0, _tBool)
@@ -182,7 +182,7 @@
 Int16 = SignedIntegralType("Int16", 2, 0, _tInt16)
 Int32 = SignedIntegralType("Int32", 4, 0, _tInt32)
 Int64 = SignedIntegralType("Int64", 8, 0, _tInt64)
-    
+
 Float32  = FloatingType("Float32", 4, 0.0, _tFloat32)
 Float64  = FloatingType("Float64", 8, 0.0, _tFloat64)
 
@@ -227,9 +227,9 @@
     Long = _register("Long", Int32)
     _register("ULong", UInt32)
     MaybeLong = _register("MaybeLong", Int32)
-    __all__.append('MaybeLong')    
-    
+    __all__.append('MaybeLong')
 
+
 _register("UByte",  UInt8)
 _register("UShort", UInt16)
 _register("UInt",   UInt32)
@@ -249,7 +249,7 @@
 _register("i8", Int64)
 if HasUInt64:
     _register("u8", UInt64)
-    
+
 _register("f4", Float32)
 _register("f8", Float64)
 _register("c8", Complex32)
@@ -272,7 +272,7 @@
     _register("l", Int64)
 else:
     _register("l", Int32)
-    
+
 _register("d", Float64)
 _register("f", Float32)
 _register("D", Complex64)
@@ -311,7 +311,7 @@
     genericTypeRank = ['Bool','Int8','UInt8','Int16','UInt16',
                        'Int32', 'UInt32', 'Int64', 'UInt64',
                        'Float32','Float64', 'Complex32', 'Complex64', 'Object']
-    
+
 pythonTypeRank = [ bool, int, long, float, complex ]
 
 # The next line is not platform independent XXX Needs to be generalized
@@ -321,7 +321,7 @@
         long:("Int64","int"),
         float:("Float64","float"),
         complex:("Complex64","complex")}
-    
+
     scalarTypeMap = {
         int:"Int32",
         long:"Int64",
@@ -348,7 +348,7 @@
 def _initGenericCoercions():
     global genericCoercions
     genericCoercions = {}
-    
+
     # vector with ...
     for ntype1 in genericTypeRank:
         nt1 = typeDict[ntype1]
@@ -375,14 +375,14 @@
                         size = min(2*ntypesize1, MAX_INT_SIZE)
                     else:
                         size = ntypesize2
-                outtype = "Int"+str(8*size)                
+                outtype = "Int"+str(8*size)
             else:
                 if rank1 >= rank2:
                     outtype = ntype1
                 else:
                     outtype = ntype2
             genericCoercions[(ntype1, ntype2)] = outtype
-            
+
         for ntype2 in pythonTypeRank:
             # scalar
             mapto, kind = pythonTypeMap[ntype2]
@@ -397,7 +397,7 @@
                     outtype = mapto
             genericCoercions[(ntype1, ntype2)] = outtype
             genericCoercions[(ntype2, ntype1)] = outtype
-            
+
     # scalar-scalar
     for ntype1 in pythonTypeRank:
         maptype1 = scalarTypeMap[ntype1]
@@ -405,7 +405,7 @@
         for ntype2 in pythonTypeRank:
             maptype2 = scalarTypeMap[ntype2]
             genericCoercions[(ntype1, ntype2)] = genericCoercions[(maptype1, maptype2)]
-            
+
     # Special cases more easily dealt with outside of the loop
     genericCoercions[("Complex32", "Float64")] = "Complex64"
     genericCoercions[("Float64", "Complex32")] = "Complex64"
@@ -454,42 +454,42 @@
 if HasUInt64:
     _MaximumType = {
         Bool :  UInt64,
-        
+
         Int8  : Int64,
         Int16 : Int64,
         Int32 : Int64,
         Int64 : Int64,
-        
+
         UInt8  : UInt64,
         UInt16 : UInt64,
         UInt32 : UInt64,
         UInt8  : UInt64,
-        
+
         Float32 : Float64,
         Float64 : Float64,
-        
+
         Complex32 : Complex64,
-        Complex64 : Complex64    
+        Complex64 : Complex64
         }
 else:
         _MaximumType = {
         Bool :  Int64,
-        
+
         Int8  : Int64,
         Int16 : Int64,
         Int32 : Int64,
         Int64 : Int64,
-        
+
         UInt8  : Int64,
         UInt16 : Int64,
         UInt32 : Int64,
         UInt8  : Int64,
-       
+
         Float32 : Float64,
         Float64 : Float64,
-        
+
         Complex32 : Complex64,
-        Complex64 : Complex64    
+        Complex64 : Complex64
         }
 
 def MaximumType(t):
@@ -510,7 +510,7 @@
         raise TypeError("Not a numeric type")
 
 scalarTypes = (bool,int,long,float,complex)
-    
+
 _scipy_dtypechar = {
     Int8 : 'b',
     UInt8 : 'B',
@@ -546,7 +546,6 @@
 else:
     _scipy_dtypechar_inverse['p'] = Int32
     _scipy_dtypechar_inverse['P'] = UInt32
-    
+
 def typefrom(obj):
     return _scipy_dtypechar_inverse[obj.dtype.char]
-

Modified: branches/splitcode/numpy/numarray/session.py
===================================================================
--- branches/splitcode/numpy/numarray/session.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/numarray/session.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -209,7 +209,7 @@
         return False
 
 
-class _SaveSession(object):    
+class _SaveSession(object):
     """Tag object which marks the end of a save session and holds the
     saved session variable names as a list of strings in the same
     order as the session pickles."""
@@ -250,13 +250,13 @@
                       Defaults to dictionary.keys().
 
     'file'            a filename or file object for the session file.
-    
+
     'dictionary'      the dictionary in which to look up the variables.
                       Defaults to the caller's globals()
-    
+
     'verbose'         print additional debug output when True.
     """
-    
+
     global VERBOSE
     VERBOSE = verbose
 
@@ -264,7 +264,7 @@
 
     if isinstance(file, str):
         file = open(file, "wb")
-        
+
     if dictionary is None:
         dictionary = _callers_globals()
 
@@ -272,7 +272,7 @@
         keys = dictionary.keys()
     else:
         keys = variables.split(",")
-        
+
     source_modules = _callers_modules() + sys.modules.keys()
 
     p = pickle.Pickler(file, protocol=2)
@@ -303,7 +303,7 @@
     file.close()
 
 def load(variables=None, file=SAVEFILE, dictionary=None, verbose=False):
-    
+
     """load a numpy session from a file and store the specified
     'variables' into 'dictionary'.
 
@@ -311,16 +311,16 @@
                       Defaults to dictionary.keys().
 
     'file'            a filename or file object for the session file.
-    
+
     'dictionary'      the dictionary in which to look up the variables.
                       Defaults to the caller's globals()
 
     'verbose'         print additional debug output when True.
     """
-    
+
     global VERBOSE
     VERBOSE = verbose
-            
+
     if isinstance(file, str):
         file = open(file, "rb")
     if dictionary is None:
@@ -346,4 +346,3 @@
 def test():
     import doctest, numpy.numarray.session
     return doctest.testmod(numpy.numarray.session)
-

Modified: branches/splitcode/numpy/numarray/setup.py
===================================================================
--- branches/splitcode/numpy/numarray/setup.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/numarray/setup.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 from os.path import join
 
 def configuration(parent_package='',top_path=None):
@@ -6,7 +5,7 @@
     config = Configuration('numarray',parent_package,top_path)
 
     config.add_data_files('numpy/')
-    
+
     # Configure fftpack_lite
     config.add_extension('_capi',
                          sources=['_capi.c']

Modified: branches/splitcode/numpy/numarray/util.py
===================================================================
--- branches/splitcode/numpy/numarray/util.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/numarray/util.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 from numpy import geterr
 
 __all__ = ['MathDomainError', 'UnderflowError', 'NumOverflowError', 'handleError',
@@ -39,4 +38,3 @@
     base = os.path.dirname(numpy.__file__)
     newdirs = [os.path.join(base, 'numarray')]
     return newdirs
-        

Modified: branches/splitcode/numpy/oldnumeric/__init__.py
===================================================================
--- branches/splitcode/numpy/oldnumeric/__init__.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/oldnumeric/__init__.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 # Don't add these to the __all__ variable though
 from numpy import *
 
@@ -34,7 +33,7 @@
 __all__ += functions.__all__
 __all__ += ufuncs.__all__
 __all__ += misc.__all__
-        
+
 del compat
 del functions
 del precision

Modified: branches/splitcode/numpy/oldnumeric/alter_code1.py
===================================================================
--- branches/splitcode/numpy/oldnumeric/alter_code1.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/oldnumeric/alter_code1.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -52,7 +52,7 @@
 
 for name in _func4:
     _astr = r"""(%s\s*[(][^,]*?[,][^,]*?[,][^,]*?[,][^'"]*?['"])b(['"][^)]*?[)])"""%name
-    func_re[name] = re.compile(_astr, re.DOTALL)    
+    func_re[name] = re.compile(_astr, re.DOTALL)
 
 for name in _meth1:
     _astr = r"""(.%s\s*[(][^'"]*?['"])b(['"][^)]*?[)])"""%name
@@ -143,7 +143,7 @@
     filestr, fromall1 = changeimports(filestr, 'ArrayPrinter', 'numpy.oldnumeric.array_printer')
     filestr, fromall2 = changeimports(filestr, 'numerix', 'numpy.oldnumeric')
     filestr, fromall3 = changeimports(filestr, 'scipy_base', 'numpy.oldnumeric')
-    filestr, fromall3 = changeimports(filestr, 'Matrix', 'numpy.oldnumeric.matrix')    
+    filestr, fromall3 = changeimports(filestr, 'Matrix', 'numpy.oldnumeric.matrix')
     filestr, fromall3 = changeimports(filestr, 'MLab', 'numpy.oldnumeric.mlab')
     filestr, fromall3 = changeimports(filestr, 'LinearAlgebra', 'numpy.oldnumeric.linear_algebra')
     filestr, fromall3 = changeimports(filestr, 'RNG', 'numpy.oldnumeric.rng')
@@ -225,7 +225,7 @@
             else:
                 os.remove(afile)
             makenewfile(afile, fstr)
-                
+
 def _func(arg, dirname, fnames):
     convertall(dirname, orig=0)
     convertsrc(dirname, ext=['h','c'], orig=0)
@@ -234,7 +234,7 @@
     """Convert all .py files and source code files in the tree given
     """
     os.path.walk(direc, _func, None)
-        
 
+
 if __name__ == '__main__':
     fromargs(sys.argv)

Modified: branches/splitcode/numpy/oldnumeric/alter_code2.py
===================================================================
--- branches/splitcode/numpy/oldnumeric/alter_code2.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/oldnumeric/alter_code2.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -30,7 +30,7 @@
 import re
 import glob
 
-# To convert typecharacters we need to 
+# To convert typecharacters we need to
 # Not very safe.  Disabled for now..
 def replacetypechars(astr):
     astr = astr.replace("'s'","'h'")
@@ -140,7 +140,7 @@
     """Convert all .py files in the tree given
 
     """
-    os.path.walk(direc, _func, None)        
+    os.path.walk(direc, _func, None)
 
 if __name__ == '__main__':
     fromargs(sys.argv)

Modified: branches/splitcode/numpy/oldnumeric/compat.py
===================================================================
--- branches/splitcode/numpy/oldnumeric/compat.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/oldnumeric/compat.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -2,7 +2,7 @@
 
 __all__ = ['NewAxis',
            'UFuncType', 'UfuncType', 'ArrayType', 'arraytype',
-           'LittleEndian', 'arrayrange', 'matrixmultiply', 
+           'LittleEndian', 'arrayrange', 'matrixmultiply',
            'array_constructor', 'pickle_array',
            'DumpArray', 'LoadArray', 'multiarray',
            # from cPickle
@@ -11,13 +11,10 @@
 
 import numpy.core.multiarray as multiarray
 import numpy.core.umath as um
-from numpy.core.numeric import array, correlate, outer, cross
-from numpy.core.umath import sign, absolute, multiply
+from numpy.core.numeric import array, correlate
 import functions
 import sys
 
-import types
-
 from cPickle import dump, dumps
 
 mu = multiarray
@@ -34,7 +31,7 @@
 
 LittleEndian = (sys.byteorder == 'little')
 
-from numpy import deprecate 
+from numpy import deprecate
 
 # backward compatibility
 arrayrange = deprecate(functions.arange, 'arrayrange', 'arange')
@@ -67,4 +64,3 @@
     else:
         return (array_constructor,
                 (a.shape, a.dtype.char, a.tostring(), LittleEndian))
-    

Modified: branches/splitcode/numpy/oldnumeric/fix_default_axis.py
===================================================================
--- branches/splitcode/numpy/oldnumeric/fix_default_axis.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/oldnumeric/fix_default_axis.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -52,7 +52,7 @@
 func_re = {}
 
 for name in _all:
-    _astr = r"""%s\s*[(]"""%name 
+    _astr = r"""%s\s*[(]"""%name
     func_re[name] = re.compile(_astr)
 
 
@@ -142,7 +142,7 @@
             fstr = "%s%s%s" % (fstr[:ind], "import numpy.oldnumeric as numpy",
                                fstr[ind+len(importstr):])
             num += 1
-            
+
     # case 2
     importre = re.compile("""import numpy as ([A-Za-z0-9_]+)""")
     modules = importre.findall(fstr)
@@ -230,7 +230,7 @@
         return fstr, total
     else:
         fstr, num = _import_change(fstr, _funcm1+_func0)
-        return fstr, num        
+        return fstr, num
 
 
 def makenewfile(name, filestr):

Modified: branches/splitcode/numpy/oldnumeric/functions.py
===================================================================
--- branches/splitcode/numpy/oldnumeric/functions.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/oldnumeric/functions.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -44,10 +44,10 @@
 
 def compress(condition, m, axis=-1):
     return N.compress(condition, m, axis)
-   
+
 def fromfunction(args, dimensions):
     return N.fromfunction(args, dimensions, dtype=int)
- 
+
 def ones(shape, typecode='l', savespace=0, dtype=None):
     """ones(shape, dtype=int) returns an array of the given
     dimensions which is initialized to all ones.
@@ -61,7 +61,7 @@
     """zeros(shape, dtype=int) returns an array of the given
     dimensions which is initialized to all zeros
     """
-    dtype = convtypecode(typecode,dtype)            
+    dtype = convtypecode(typecode,dtype)
     return mu.zeros(shape, dtype)
 
 def identity(n,typecode='l', dtype=None):
@@ -71,7 +71,7 @@
     return nn.identity(n, dtype)
 
 def empty(shape, typecode='l', dtype=None):
-    dtype = convtypecode(typecode, dtype)    
+    dtype = convtypecode(typecode, dtype)
     return mu.empty(shape, dtype)
 
 def array(sequence, typecode=None, copy=1, savespace=0, dtype=None):
@@ -122,4 +122,3 @@
 
 def average(a, axis=0, weights=None, returned=False):
     return N.average(a, axis, weights, returned)
-

Modified: branches/splitcode/numpy/oldnumeric/linear_algebra.py
===================================================================
--- branches/splitcode/numpy/oldnumeric/linear_algebra.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/oldnumeric/linear_algebra.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 """Backward compatible with LinearAlgebra from Numeric
 """
 # This module is a lite version of the linalg.py module in SciPy which contains
@@ -7,10 +6,10 @@
 # zgeev, dgesdd, zgesdd, dgelsd, zgelsd, dsyevd, zheevd, dgetrf, dpotrf.
 
 
-__all__ = ['LinAlgError', 'solve_linear_equations', 
+__all__ = ['LinAlgError', 'solve_linear_equations',
            'inverse', 'cholesky_decomposition', 'eigenvalues',
-           'Heigenvalues', 'generalized_inverse', 
-           'determinant', 'singular_value_decomposition', 
+           'Heigenvalues', 'generalized_inverse',
+           'determinant', 'singular_value_decomposition',
            'eigenvectors',  'Heigenvectors',
            'linear_least_squares'
            ]
@@ -52,7 +51,7 @@
 def Heigenvectors(A):
     w, v = linalg.eigh(A)
     return w, transpose(v)
-    
+
 # Generalized inverse
 
 def generalized_inverse(a, rcond = 1.e-10):

Modified: branches/splitcode/numpy/oldnumeric/matrix.py
===================================================================
--- branches/splitcode/numpy/oldnumeric/matrix.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/oldnumeric/matrix.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,4 @@
-# This module is for compatibility only.  
+# This module is for compatibility only.
 
 __all__ = ['UserArray', 'squeeze', 'Matrix', 'asarray', 'dot', 'k', 'Numeric', 'LinearAlgebra', 'identity', 'multiply', 'types', 'string']
 
@@ -10,7 +10,7 @@
 import numpy.oldnumeric.linear_algebra as LinearAlgebra
 from numpy import matrix as Matrix, squeeze
 
-# Hidden names that will be the same. 
+# Hidden names that will be the same.
 
 _table = [None]*256
 for k in range(256):

Modified: branches/splitcode/numpy/oldnumeric/misc.py
===================================================================
--- branches/splitcode/numpy/oldnumeric/misc.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/oldnumeric/misc.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -31,7 +31,7 @@
 
 class Unpickler(pickle.Unpickler):
     def __init__(self, *args, **kwds):
-        raise NotImplemented    
+        raise NotImplemented
     def load_array(self):
         raise NotImplemented
 

Modified: branches/splitcode/numpy/oldnumeric/mlab.py
===================================================================
--- branches/splitcode/numpy/oldnumeric/mlab.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/oldnumeric/mlab.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -13,7 +13,7 @@
 from numpy.linalg import eig, svd
 from numpy.random import rand, randn
 import numpy as nn
-     
+
 from typeconv import convtypecode
 
 def eye(N, M=None, k=0, typecode=None, dtype=None):
@@ -25,7 +25,7 @@
     m = nn.equal(nn.subtract.outer(nn.arange(N), nn.arange(M)),-k)
     if m.dtype != dtype:
         return m.astype(dtype)
-    
+
 def tri(N, M=None, k=0, typecode=None, dtype=None):
     """ returns a N-by-M array where all the diagonals starting from
         lower left corner up to the k-th are all ones.
@@ -35,7 +35,7 @@
     m = nn.greater_equal(nn.subtract.outer(nn.arange(N), nn.arange(M)),-k)
     if m.dtype != dtype:
         return m.astype(dtype)
-    
+
 def trapz(y, x=None, axis=-1):
     return _Ntrapz(y, x, axis=axis)
 
@@ -113,10 +113,9 @@
 __all__ += functions.__all__
 __all__ += ufuncs.__all__
 __all__ += misc.__all__
-        
+
 del compat
 del functions
 del precision
 del ufuncs
 del misc
-

Modified: branches/splitcode/numpy/oldnumeric/precision.py
===================================================================
--- branches/splitcode/numpy/oldnumeric/precision.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/oldnumeric/precision.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -3,7 +3,7 @@
 #  The character strings are still for "new" NumPy
 #   which is the only Incompatibility with Numeric
 
-__all__ = ['Character', 'Complex', 'Float', 
+__all__ = ['Character', 'Complex', 'Float',
            'PrecisionError', 'PyObject', 'Int', 'UInt',
            'UnsignedInteger', 'string', 'typecodes', 'zeros']
 
@@ -46,25 +46,25 @@
 try:
     UnsignedInt16 = _lookup(_code_table, "UnsignedInteger", 16)
     UInt16 = UnsignedInt16
-    __all__.extend(['UnsignedInt16', 'UInt16'])    
+    __all__.extend(['UnsignedInt16', 'UInt16'])
 except(PrecisionError):
     pass
 try:
     UnsignedInt32 = _lookup(_code_table, "UnsignedInteger", 32)
     UInt32 = UnsignedInt32
-    __all__.extend(['UnsignedInt32', 'UInt32'])        
+    __all__.extend(['UnsignedInt32', 'UInt32'])
 except(PrecisionError):
     pass
 try:
     UnsignedInt64 = _lookup(_code_table, "UnsignedInteger", 64)
     UInt64 = UnsignedInt64
-    __all__.extend(['UnsignedInt64', 'UInt64'])        
+    __all__.extend(['UnsignedInt64', 'UInt64'])
 except(PrecisionError):
     pass
 try:
     UnsignedInt128 = _lookup(_code_table, "UnsignedInteger", 128)
     UInt128 = UnsignedInt128
-    __all__.extend(['UnsignedInt128', 'UInt128'])            
+    __all__.extend(['UnsignedInt128', 'UInt128'])
 except(PrecisionError):
     pass
 UnsignedInteger = 'u'
@@ -77,7 +77,7 @@
     pass
 try:
     Int8 = _lookup(_code_table, 'Integer', 8)
-    __all__.append('Int8')    
+    __all__.append('Int8')
 except(PrecisionError):
     pass
 try:
@@ -109,7 +109,7 @@
     pass
 try:
     Float8 = _lookup(_code_table, 'Float', 8)
-    __all__.append('Float8')    
+    __all__.append('Float8')
 except(PrecisionError):
     pass
 try:
@@ -119,17 +119,17 @@
     pass
 try:
     Float32 = _lookup(_code_table, 'Float', 32)
-    __all__.append('Float32')      
+    __all__.append('Float32')
 except(PrecisionError):
     pass
 try:
     Float64 = _lookup(_code_table, 'Float', 64)
-    __all__.append('Float64')          
+    __all__.append('Float64')
 except(PrecisionError):
     pass
 try:
     Float128 = _lookup(_code_table, 'Float', 128)
-    __all__.append('Float128')              
+    __all__.append('Float128')
 except(PrecisionError):
     pass
 Float = 'd'
@@ -141,22 +141,22 @@
     pass
 try:
     Complex8 = _lookup(_code_table, 'Complex', 16)
-    __all__.append('Complex8')    
+    __all__.append('Complex8')
 except(PrecisionError):
     pass
 try:
     Complex16 = _lookup(_code_table, 'Complex', 32)
-    __all__.append('Complex16')        
+    __all__.append('Complex16')
 except(PrecisionError):
     pass
 try:
     Complex32 = _lookup(_code_table, 'Complex', 64)
-    __all__.append('Complex32')        
+    __all__.append('Complex32')
 except(PrecisionError):
     pass
 try:
     Complex64 = _lookup(_code_table, 'Complex', 128)
-    __all__.append('Complex64')            
+    __all__.append('Complex64')
 except(PrecisionError):
     pass
 try:

Modified: branches/splitcode/numpy/oldnumeric/random_array.py
===================================================================
--- branches/splitcode/numpy/oldnumeric/random_array.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/oldnumeric/random_array.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -18,7 +18,7 @@
     if (x == 0 or y == 0):
         mt.seed()
     else:
-        mt.seed((x,y))        
+        mt.seed((x,y))
 
 def get_seed():
     raise NotImplementedError, \
@@ -72,31 +72,31 @@
     return mt.standard_normal(shape)
 
 def normal(mean, std, shape=[]):
-        """normal(mean, std, n) or normal(mean, std, [n, m, ...]) returns
-           array of random numbers randomly distributed with specified mean and
-           standard deviation"""
-        if shape == []:
-            shape = None
-        return mt.normal(mean, std, shape)
+    """normal(mean, std, n) or normal(mean, std, [n, m, ...]) returns
+    array of random numbers randomly distributed with specified mean and
+    standard deviation"""
+    if shape == []:
+        shape = None
+    return mt.normal(mean, std, shape)
 
 def multivariate_normal(mean, cov, shape=[]):
-       """multivariate_normal(mean, cov) or multivariate_normal(mean, cov, [m, n, ...])
-          returns an array containing multivariate normally distributed random numbers
-          with specified mean and covariance.
+    """multivariate_normal(mean, cov) or multivariate_normal(mean, cov, [m, n, ...])
+    returns an array containing multivariate normally distributed random numbers
+    with specified mean and covariance.
+    
+    mean must be a 1 dimensional array. cov must be a square two dimensional
+    array with the same number of rows and columns as mean has elements.
+    
+    The first form returns a single 1-D array containing a multivariate
+    normal.
+    
+    The second form returns an array of shape (m, n, ..., cov.shape[0]).
+    In this case, output[i,j,...,:] is a 1-D array containing a multivariate
+    normal."""
+    if shape == []:
+        shape = None
+    return mt.multivariate_normal(mean, cov, shape)
 
-          mean must be a 1 dimensional array. cov must be a square two dimensional
-          array with the same number of rows and columns as mean has elements.
-
-          The first form returns a single 1-D array containing a multivariate
-          normal.
-
-          The second form returns an array of shape (m, n, ..., cov.shape[0]).
-          In this case, output[i,j,...,:] is a 1-D array containing a multivariate
-          normal."""
-       if shape == []:
-           shape = None
-       return mt.multivariate_normal(mean, cov, shape)
-
 def exponential(mean, shape=[]):
     """exponential(mean, n) or exponential(mean, [n, m, ...]) returns array
       of random numbers exponentially distributed with specified mean"""
@@ -195,8 +195,8 @@
     print "(should be about ", mean, "):", x_mean
     print "Variance of those random numbers (should be about ", var, "):", x_var
     if skew != []:
-       x_skew = (Numeric.sum(x_minus_mean*x_minus_mean*x_minus_mean,axis=0)/9998.)/x_var**(3./2.)
-       print "Skewness of those random numbers (should be about ", skew, "):", x_skew
+        x_skew = (Numeric.sum(x_minus_mean*x_minus_mean*x_minus_mean,axis=0)/9998.)/x_var**(3./2.)
+        print "Skewness of those random numbers (should be about ", skew, "):", x_skew
 
 def test():
     obj = mt.get_state()
@@ -266,5 +266,3 @@
 
 if __name__ == '__main__':
     test()
-
-

Modified: branches/splitcode/numpy/oldnumeric/rng.py
===================================================================
--- branches/splitcode/numpy/oldnumeric/rng.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/oldnumeric/rng.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,7 +1,7 @@
 # This module re-creates the RNG interface from Numeric
 # Replace import RNG with import numpy.oldnumeric.rng as RNG
 #
-# It is for backwards compatibility only. 
+# It is for backwards compatibility only.
 
 
 __all__ = ['CreateGenerator','ExponentialDistribution','LogNormalDistribution','NormalDistribution',
@@ -21,7 +21,7 @@
 
     def density(self,x):
         raise NotImplementedError
-    
+
     def __call__(self, x):
         return self.density(x)
 
@@ -36,7 +36,7 @@
 class ExponentialDistribution(Distribution):
     def __init__(self, lambda_):
         if (lambda_ <= 0):
-            raise error, "parameter must be positive"  
+            raise error, "parameter must be positive"
         Distribution.__init__(self, 'exponential', lambda_)
 
     def density(x):
@@ -115,7 +115,7 @@
     def sample(self, n):
         return self._dist._sample(self._rng, n)
 
-    
+
 standard_generator = CreateGenerator(-1)
 
 def ranf():
@@ -126,12 +126,10 @@
     """random_sample(n) = array of n random numbers;
 
     random_sample(n1, n2, ...)= random array of shape (n1, n2, ..)"""
-    
+
     if not n:
         return standard_generator.ranf()
     m = 1
     for i in n:
         m = m * i
     return standard_generator.sample(m).reshape(*n)
-    
-

Modified: branches/splitcode/numpy/oldnumeric/tests/test_oldnumeric.py
===================================================================
--- branches/splitcode/numpy/oldnumeric/tests/test_oldnumeric.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/oldnumeric/tests/test_oldnumeric.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -80,7 +80,7 @@
         a1 = array([0,1,0], Bool)
         a2 = array([0,1,0], bool)
         assert_array_equal(a1, a2)
-        
 
+
 if __name__ == "__main__":
     NumPyTest().run()

Modified: branches/splitcode/numpy/oldnumeric/typeconv.py
===================================================================
--- branches/splitcode/numpy/oldnumeric/typeconv.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/oldnumeric/typeconv.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 __all__ = ['oldtype2dtype', 'convtypecode', 'convtypecode2', 'oldtypecodes']
 
 import numpy as N
@@ -48,7 +47,7 @@
                  'h': 's',
                  'H': 'w',
                  'I': 'u'}
-                 
+
 class _oldtypecodes(dict):
     def __getitem__(self, obj):
         char = N.dtype(obj).char

Modified: branches/splitcode/numpy/oldnumeric/ufuncs.py
===================================================================
--- branches/splitcode/numpy/oldnumeric/ufuncs.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/oldnumeric/ufuncs.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -17,4 +17,3 @@
      arccosh, logical_or, minimum, conjugate, tan, greater, bitwise_xor, \
      fabs, floor, sqrt, arctan, right_shift, absolute, sin, \
      multiply, greater_equal, left_shift, exp, divide as divide_safe
- 

Modified: branches/splitcode/numpy/random/mtrand/mtrand.c
===================================================================
--- branches/splitcode/numpy/random/mtrand/mtrand.c	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/random/mtrand/mtrand.c	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,10 +1,18 @@
-/* Generated by Pyrex 0.9.4.1 on Sat Dec  9 15:35:19 2006 */
+/* Generated by Pyrex 0.9.4.1 on Tue Jan  9 00:09:40 2007 */
 
+#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "structmember.h"
 #ifndef PY_LONG_LONG
   #define PY_LONG_LONG LONG_LONG
 #endif
+#if PY_VERSION_HEX < 0x02050000
+  typedef int Py_ssize_t;
+  #define PY_SSIZE_T_MAX INT_MAX
+  #define PY_SSIZE_T_MIN INT_MIN
+  #define PyInt_FromSsize_t(z) PyInt_FromLong(z)
+  #define PyInt_AsSsize_t(o)   PyInt_AsLong(o)
+#endif
 #ifdef __cplusplus
 #define __PYX_EXTERN_C extern "C"
 #else
@@ -19,20 +27,23 @@
 #include "initarray.h"
 
 
+typedef struct {const char *s; const void **p;} __Pyx_CApiTabEntry; /*proto*/
 typedef struct {PyObject **p; char *s;} __Pyx_InternTabEntry; /*proto*/
 typedef struct {PyObject **p; char *s; long n;} __Pyx_StringTabEntry; /*proto*/
-static PyObject *__Pyx_UnpackItem(PyObject *, int); /*proto*/
-static int __Pyx_EndUnpack(PyObject *, int); /*proto*/
+static PyObject *__Pyx_UnpackItem(PyObject *, Py_ssize_t); /*proto*/
+static int __Pyx_EndUnpack(PyObject *, Py_ssize_t); /*proto*/
 static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb); /*proto*/
 static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list); /*proto*/
 static PyObject *__Pyx_GetExcValue(void); /*proto*/
 static int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type); /*proto*/
-static int __Pyx_GetStarArgs(PyObject **args, PyObject **kwds, char *kwd_list[], int nargs, PyObject **args2, PyObject **kwds2); /*proto*/
+static int __Pyx_GetStarArgs(PyObject **args, PyObject **kwds, char *kwd_list[], Py_ssize_t nargs, PyObject **args2, PyObject **kwds2); /*proto*/
 static void __Pyx_WriteUnraisable(char *name); /*proto*/
 static void __Pyx_AddTraceback(char *funcname); /*proto*/
 static PyTypeObject *__Pyx_ImportType(char *module_name, char *class_name, long size);  /*proto*/
 static int __Pyx_InternStrings(__Pyx_InternTabEntry *t); /*proto*/
 static int __Pyx_InitStrings(__Pyx_StringTabEntry *t); /*proto*/
+static int __Pyx_InitCApi(PyObject *module); /*proto*/
+static int __Pyx_ImportModuleCApi(__Pyx_CApiTabEntry *t); /*proto*/
 static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name); /*proto*/
 
 static PyObject *__pyx_m;
@@ -190,11 +201,11 @@
   Py_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":129 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":129 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":130 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":130 */
     __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 130; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -203,7 +214,7 @@
   }
   /*else*/ {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":132 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":132 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 132; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 132; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -215,7 +226,7 @@
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_size);
     PyTuple_SET_ITEM(__pyx_2, 1, __pyx_4);
     __pyx_4 = 0;
-    __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 132; goto __pyx_L1;}
+    __pyx_4 = PyObject_Call(__pyx_3, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 132; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4)));
@@ -223,22 +234,22 @@
     arrayObject = ((PyArrayObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":133 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":133 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":134 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":134 */
     __pyx_v_array_data = ((double (*))arrayObject->data);
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":135 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":135 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":136 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":136 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state);
       __pyx_L3:;
     }
     __pyx_L4:;
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":137 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":137 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
@@ -286,31 +297,31 @@
   __pyx_v_itera = ((PyArrayIterObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":149 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":149 */
   __pyx_v_scalar = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":150 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":150 */
   __pyx_1 = (__pyx_v_oa->nd == 0);
   if (__pyx_1) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":151 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":151 */
     __pyx_v_oa_data = ((double (*))__pyx_v_oa->data);
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":152 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":152 */
     __pyx_v_scalar = 1;
     goto __pyx_L2;
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":154 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":154 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":155 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":155 */
     __pyx_1 = __pyx_v_scalar;
     if (__pyx_1) {
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":156 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":156 */
       __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]))); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 156; goto __pyx_L1;}
       __pyx_r = __pyx_2;
       __pyx_2 = 0;
@@ -319,33 +330,33 @@
     }
     /*else*/ {
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":158 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":158 */
       __pyx_2 = PyArray_SimpleNew(__pyx_v_oa->nd,__pyx_v_oa->dimensions,NPY_DOUBLE); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 158; goto __pyx_L1;}
       Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
       Py_DECREF(((PyObject *)arrayObject));
       arrayObject = ((PyArrayObject *)__pyx_2);
       Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":159 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":159 */
       __pyx_v_length = PyArray_SIZE(arrayObject);
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":160 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":160 */
       __pyx_v_array_data = ((double (*))arrayObject->data);
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":161 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":161 */
       __pyx_2 = PyArray_IterNew(((PyObject *)__pyx_v_oa)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 161; goto __pyx_L1;}
       Py_INCREF(((PyObject *)((PyArrayIterObject *)__pyx_2)));
       Py_DECREF(((PyObject *)__pyx_v_itera));
       __pyx_v_itera = ((PyArrayIterObject *)__pyx_2);
       Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":162 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":162 */
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":163 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":163 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(((double (*))__pyx_v_itera->dataptr)[0]));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":164 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":164 */
         PyArray_ITER_NEXT(__pyx_v_itera);
         __pyx_L5:;
       }
@@ -356,7 +367,7 @@
   }
   /*else*/ {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":166 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":166 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 166; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 166; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -368,7 +379,7 @@
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_size);
     PyTuple_SET_ITEM(__pyx_2, 1, __pyx_4);
     __pyx_4 = 0;
-    __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 166; goto __pyx_L1;}
+    __pyx_4 = PyObject_Call(__pyx_3, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 166; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4)));
@@ -376,20 +387,20 @@
     arrayObject = ((PyArrayObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":167 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":167 */
     __pyx_v_array_data = ((double (*))arrayObject->data);
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":168 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":168 */
     __pyx_1 = __pyx_v_scalar;
     if (__pyx_1) {
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":169 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":169 */
       __pyx_v_length = PyArray_SIZE(arrayObject);
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":170 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":170 */
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":171 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":171 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]));
         __pyx_L8:;
       }
@@ -398,23 +409,23 @@
     }
     /*else*/ {
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":173 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":173 */
       __pyx_3 = PyArray_MultiIterNew(2,((void (*))arrayObject),((void (*))__pyx_v_oa)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 173; goto __pyx_L1;}
       Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_3)));
       Py_DECREF(((PyObject *)__pyx_v_multi));
       __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_3);
       Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":175 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":175 */
       __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
       if (__pyx_1) {
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":176 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":176 */
         __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 176; goto __pyx_L1;}
         __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 176; goto __pyx_L1;}
         Py_INCREF(__pyx_k60p);
         PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k60p);
-        __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 176; goto __pyx_L1;}
+        __pyx_3 = PyObject_Call(__pyx_2, __pyx_4, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 176; goto __pyx_L1;}
         Py_DECREF(__pyx_2); __pyx_2 = 0;
         Py_DECREF(__pyx_4); __pyx_4 = 0;
         __Pyx_Raise(__pyx_3, 0, 0);
@@ -424,17 +435,17 @@
       }
       __pyx_L10:;
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":177 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":177 */
       __pyx_5 = __pyx_v_multi->size;
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_5; ++__pyx_v_i) {
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":178 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":178 */
         __pyx_v_oa_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":179 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":179 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":180 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":180 */
         PyArray_MultiIter_NEXTi(__pyx_v_multi,1);
         __pyx_L11:;
       }
@@ -444,7 +455,7 @@
   }
   __pyx_L3:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":181 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":181 */
   Py_INCREF(((PyObject *)arrayObject));
   __pyx_r = ((PyObject *)arrayObject);
   goto __pyx_L0;
@@ -491,37 +502,37 @@
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":194 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":194 */
   __pyx_v_scalar = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":195 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":195 */
   __pyx_1 = (__pyx_v_oa->nd == 0);
   if (__pyx_1) {
     __pyx_1 = (__pyx_v_ob->nd == 0);
   }
   if (__pyx_1) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":196 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":196 */
     __pyx_v_oa_data = ((double (*))__pyx_v_oa->data);
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":197 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":197 */
     __pyx_v_ob_data = ((double (*))__pyx_v_ob->data);
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":198 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":198 */
     __pyx_v_scalar = 1;
     goto __pyx_L2;
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":200 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":200 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":201 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":201 */
     __pyx_1 = __pyx_v_scalar;
     if (__pyx_1) {
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":202 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":202 */
       __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]),(__pyx_v_ob_data[0]))); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 202; goto __pyx_L1;}
       __pyx_r = __pyx_2;
       __pyx_2 = 0;
@@ -530,37 +541,37 @@
     }
     /*else*/ {
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":204 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":204 */
       __pyx_2 = PyArray_MultiIterNew(2,((void (*))__pyx_v_oa),((void (*))__pyx_v_ob)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 204; goto __pyx_L1;}
       Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_2)));
       Py_DECREF(((PyObject *)__pyx_v_multi));
       __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_2);
       Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":205 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":205 */
       __pyx_2 = PyArray_SimpleNew(__pyx_v_multi->nd,__pyx_v_multi->dimensions,NPY_DOUBLE); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 205; goto __pyx_L1;}
       Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
       Py_DECREF(((PyObject *)arrayObject));
       arrayObject = ((PyArrayObject *)__pyx_2);
       Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":206 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":206 */
       __pyx_v_array_data = ((double (*))arrayObject->data);
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":207 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":207 */
       __pyx_3 = __pyx_v_multi->size;
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":208 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":208 */
         __pyx_v_oa_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,0));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":209 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":209 */
         __pyx_v_ob_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":210 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":210 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]),(__pyx_v_ob_data[0]));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":211 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":211 */
         PyArray_MultiIter_NEXT(__pyx_v_multi);
         __pyx_L5:;
       }
@@ -571,7 +582,7 @@
   }
   /*else*/ {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":213 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":213 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 213; goto __pyx_L1;}
     __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 213; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -583,7 +594,7 @@
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_size);
     PyTuple_SET_ITEM(__pyx_2, 1, __pyx_5);
     __pyx_5 = 0;
-    __pyx_5 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 213; goto __pyx_L1;}
+    __pyx_5 = PyObject_Call(__pyx_4, __pyx_2, 0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 213; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_5)));
@@ -591,20 +602,20 @@
     arrayObject = ((PyArrayObject *)__pyx_5);
     Py_DECREF(__pyx_5); __pyx_5 = 0;
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":214 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":214 */
     __pyx_v_array_data = ((double (*))arrayObject->data);
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":215 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":215 */
     __pyx_1 = __pyx_v_scalar;
     if (__pyx_1) {
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":216 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":216 */
       __pyx_v_length = PyArray_SIZE(arrayObject);
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":217 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":217 */
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":218 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":218 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]),(__pyx_v_ob_data[0]));
         __pyx_L8:;
       }
@@ -613,23 +624,23 @@
     }
     /*else*/ {
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":220 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":220 */
       __pyx_4 = PyArray_MultiIterNew(3,((void (*))arrayObject),((void (*))__pyx_v_oa),((void (*))__pyx_v_ob)); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 220; goto __pyx_L1;}
       Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_4)));
       Py_DECREF(((PyObject *)__pyx_v_multi));
       __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_4);
       Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":221 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":221 */
       __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
       if (__pyx_1) {
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":222 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":222 */
         __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 222; goto __pyx_L1;}
         __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 222; goto __pyx_L1;}
         Py_INCREF(__pyx_k61p);
         PyTuple_SET_ITEM(__pyx_5, 0, __pyx_k61p);
-        __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 222; goto __pyx_L1;}
+        __pyx_4 = PyObject_Call(__pyx_2, __pyx_5, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 222; goto __pyx_L1;}
         Py_DECREF(__pyx_2); __pyx_2 = 0;
         Py_DECREF(__pyx_5); __pyx_5 = 0;
         __Pyx_Raise(__pyx_4, 0, 0);
@@ -639,23 +650,23 @@
       }
       __pyx_L10:;
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":223 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":223 */
       __pyx_3 = __pyx_v_multi->size;
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":224 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":224 */
         __pyx_v_oa_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":225 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":225 */
         __pyx_v_ob_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,2));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":226 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":226 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]),(__pyx_v_ob_data[0]));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":227 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":227 */
         PyArray_MultiIter_NEXTi(__pyx_v_multi,1);
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":228 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":228 */
         PyArray_MultiIter_NEXTi(__pyx_v_multi,2);
         __pyx_L11:;
       }
@@ -665,7 +676,7 @@
   }
   __pyx_L3:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":229 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":229 */
   Py_INCREF(((PyObject *)arrayObject));
   __pyx_r = ((PyObject *)arrayObject);
   goto __pyx_L0;
@@ -714,10 +725,10 @@
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":244 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":244 */
   __pyx_v_scalar = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":245 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":245 */
   __pyx_1 = (__pyx_v_oa->nd == 0);
   if (__pyx_1) {
     __pyx_1 = (__pyx_v_ob->nd == 0);
@@ -727,30 +738,30 @@
   }
   if (__pyx_1) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":246 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":246 */
     __pyx_v_oa_data = ((double (*))__pyx_v_oa->data);
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":247 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":247 */
     __pyx_v_ob_data = ((double (*))__pyx_v_ob->data);
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":248 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":248 */
     __pyx_v_oc_data = ((double (*))__pyx_v_oc->data);
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":249 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":249 */
     __pyx_v_scalar = 1;
     goto __pyx_L2;
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":251 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":251 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":252 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":252 */
     __pyx_1 = __pyx_v_scalar;
     if (__pyx_1) {
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":253 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":253 */
       __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]),(__pyx_v_ob_data[0]),(__pyx_v_oc_data[0]))); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 253; goto __pyx_L1;}
       __pyx_r = __pyx_2;
       __pyx_2 = 0;
@@ -759,40 +770,40 @@
     }
     /*else*/ {
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":255 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":255 */
       __pyx_2 = PyArray_MultiIterNew(3,((void (*))__pyx_v_oa),((void (*))__pyx_v_ob),((void (*))__pyx_v_oc)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 255; goto __pyx_L1;}
       Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_2)));
       Py_DECREF(((PyObject *)__pyx_v_multi));
       __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_2);
       Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":256 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":256 */
       __pyx_2 = PyArray_SimpleNew(__pyx_v_multi->nd,__pyx_v_multi->dimensions,NPY_DOUBLE); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 256; goto __pyx_L1;}
       Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
       Py_DECREF(((PyObject *)arrayObject));
       arrayObject = ((PyArrayObject *)__pyx_2);
       Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":257 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":257 */
       __pyx_v_array_data = ((double (*))arrayObject->data);
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":258 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":258 */
       __pyx_3 = __pyx_v_multi->size;
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":259 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":259 */
         __pyx_v_oa_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,0));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":260 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":260 */
         __pyx_v_ob_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":261 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":261 */
         __pyx_v_oc_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,2));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":262 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":262 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]),(__pyx_v_ob_data[0]),(__pyx_v_oc_data[0]));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":263 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":263 */
         PyArray_MultiIter_NEXT(__pyx_v_multi);
         __pyx_L5:;
       }
@@ -803,7 +814,7 @@
   }
   /*else*/ {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":265 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":265 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; goto __pyx_L1;}
     __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -815,7 +826,7 @@
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_size);
     PyTuple_SET_ITEM(__pyx_2, 1, __pyx_5);
     __pyx_5 = 0;
-    __pyx_5 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; goto __pyx_L1;}
+    __pyx_5 = PyObject_Call(__pyx_4, __pyx_2, 0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_5)));
@@ -823,20 +834,20 @@
     arrayObject = ((PyArrayObject *)__pyx_5);
     Py_DECREF(__pyx_5); __pyx_5 = 0;
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":266 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":266 */
     __pyx_v_array_data = ((double (*))arrayObject->data);
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":267 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":267 */
     __pyx_1 = __pyx_v_scalar;
     if (__pyx_1) {
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":268 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":268 */
       __pyx_v_length = PyArray_SIZE(arrayObject);
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":269 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":269 */
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":270 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":270 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]),(__pyx_v_ob_data[0]),(__pyx_v_oc_data[0]));
         __pyx_L8:;
       }
@@ -845,23 +856,23 @@
     }
     /*else*/ {
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":272 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":272 */
       __pyx_4 = PyArray_MultiIterNew(4,((void (*))arrayObject),((void (*))__pyx_v_oa),((void (*))__pyx_v_ob),((void (*))__pyx_v_oc)); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 272; goto __pyx_L1;}
       Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_4)));
       Py_DECREF(((PyObject *)__pyx_v_multi));
       __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_4);
       Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":274 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":274 */
       __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
       if (__pyx_1) {
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":275 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":275 */
         __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; goto __pyx_L1;}
         __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; goto __pyx_L1;}
         Py_INCREF(__pyx_k62p);
         PyTuple_SET_ITEM(__pyx_5, 0, __pyx_k62p);
-        __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; goto __pyx_L1;}
+        __pyx_4 = PyObject_Call(__pyx_2, __pyx_5, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; goto __pyx_L1;}
         Py_DECREF(__pyx_2); __pyx_2 = 0;
         Py_DECREF(__pyx_5); __pyx_5 = 0;
         __Pyx_Raise(__pyx_4, 0, 0);
@@ -871,23 +882,23 @@
       }
       __pyx_L10:;
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":276 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":276 */
       __pyx_3 = __pyx_v_multi->size;
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":277 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":277 */
         __pyx_v_oa_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":278 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":278 */
         __pyx_v_ob_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,2));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":279 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":279 */
         __pyx_v_oc_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,3));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":280 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":280 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]),(__pyx_v_ob_data[0]),(__pyx_v_oc_data[0]));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":281 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":281 */
         PyArray_MultiIter_NEXT(__pyx_v_multi);
         __pyx_L11:;
       }
@@ -897,7 +908,7 @@
   }
   __pyx_L3:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":282 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":282 */
   Py_INCREF(((PyObject *)arrayObject));
   __pyx_r = ((PyObject *)arrayObject);
   goto __pyx_L0;
@@ -935,11 +946,11 @@
   Py_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":290 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":290 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":291 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":291 */
     __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 291; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -948,7 +959,7 @@
   }
   /*else*/ {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":293 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":293 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 293; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 293; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -958,7 +969,7 @@
     PyTuple_SET_ITEM(__pyx_4, 0, __pyx_v_size);
     PyTuple_SET_ITEM(__pyx_4, 1, __pyx_2);
     __pyx_2 = 0;
-    __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 293; goto __pyx_L1;}
+    __pyx_2 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 293; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
@@ -966,22 +977,22 @@
     arrayObject = ((PyArrayObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":294 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":294 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":295 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":295 */
     __pyx_v_array_data = ((long (*))arrayObject->data);
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":296 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":296 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":297 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":297 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state);
       __pyx_L3:;
     }
     __pyx_L4:;
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":298 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":298 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
@@ -1027,37 +1038,37 @@
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":310 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":310 */
   __pyx_v_scalar = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":311 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":311 */
   __pyx_1 = (__pyx_v_on->nd == 0);
   if (__pyx_1) {
     __pyx_1 = (__pyx_v_op->nd == 0);
   }
   if (__pyx_1) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":312 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":312 */
     __pyx_v_on_data = ((long (*))__pyx_v_on->data);
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":313 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":313 */
     __pyx_v_op_data = ((double (*))__pyx_v_op->data);
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":314 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":314 */
     __pyx_v_scalar = 1;
     goto __pyx_L2;
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":316 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":316 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":317 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":317 */
     __pyx_1 = __pyx_v_scalar;
     if (__pyx_1) {
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":318 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":318 */
       __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state,(__pyx_v_on_data[0]),(__pyx_v_op_data[0]))); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 318; goto __pyx_L1;}
       __pyx_r = __pyx_2;
       __pyx_2 = 0;
@@ -1066,37 +1077,37 @@
     }
     /*else*/ {
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":320 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":320 */
       __pyx_2 = PyArray_MultiIterNew(2,((void (*))__pyx_v_on),((void (*))__pyx_v_op)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 320; goto __pyx_L1;}
       Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_2)));
       Py_DECREF(((PyObject *)__pyx_v_multi));
       __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_2);
       Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":321 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":321 */
       __pyx_2 = PyArray_SimpleNew(__pyx_v_multi->nd,__pyx_v_multi->dimensions,NPY_LONG); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 321; goto __pyx_L1;}
       Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
       Py_DECREF(((PyObject *)arrayObject));
       arrayObject = ((PyArrayObject *)__pyx_2);
       Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":322 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":322 */
       __pyx_v_array_data = ((long (*))arrayObject->data);
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":323 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":323 */
       __pyx_3 = __pyx_v_multi->size;
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":324 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":324 */
         __pyx_v_on_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,0));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":325 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":325 */
         __pyx_v_op_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":326 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":326 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_on_data[0]),(__pyx_v_op_data[0]));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":327 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":327 */
         PyArray_MultiIter_NEXT(__pyx_v_multi);
         __pyx_L5:;
       }
@@ -1107,7 +1118,7 @@
   }
   /*else*/ {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":329 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":329 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 329; goto __pyx_L1;}
     __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 329; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -1117,7 +1128,7 @@
     PyTuple_SET_ITEM(__pyx_5, 0, __pyx_v_size);
     PyTuple_SET_ITEM(__pyx_5, 1, __pyx_2);
     __pyx_2 = 0;
-    __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 329; goto __pyx_L1;}
+    __pyx_2 = PyObject_Call(__pyx_4, __pyx_5, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 329; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     Py_DECREF(__pyx_5); __pyx_5 = 0;
     Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
@@ -1125,20 +1136,20 @@
     arrayObject = ((PyArrayObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":330 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":330 */
     __pyx_1 = __pyx_v_scalar;
     if (__pyx_1) {
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":331 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":331 */
       __pyx_v_length = PyArray_SIZE(arrayObject);
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":332 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":332 */
       __pyx_v_array_data = ((long (*))arrayObject->data);
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":333 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":333 */
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":334 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":334 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_on_data[0]),(__pyx_v_op_data[0]));
         __pyx_L8:;
       }
@@ -1147,23 +1158,23 @@
     }
     /*else*/ {
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":336 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":336 */
       __pyx_4 = PyArray_MultiIterNew(3,((void (*))arrayObject),((void (*))__pyx_v_on),((void (*))__pyx_v_op)); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 336; goto __pyx_L1;}
       Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_4)));
       Py_DECREF(((PyObject *)__pyx_v_multi));
       __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_4);
       Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":337 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":337 */
       __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
       if (__pyx_1) {
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":338 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":338 */
         __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 338; goto __pyx_L1;}
         __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 338; goto __pyx_L1;}
         Py_INCREF(__pyx_k63p);
         PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k63p);
-        __pyx_4 = PyObject_CallObject(__pyx_5, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 338; goto __pyx_L1;}
+        __pyx_4 = PyObject_Call(__pyx_5, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 338; goto __pyx_L1;}
         Py_DECREF(__pyx_5); __pyx_5 = 0;
         Py_DECREF(__pyx_2); __pyx_2 = 0;
         __Pyx_Raise(__pyx_4, 0, 0);
@@ -1173,23 +1184,23 @@
       }
       __pyx_L10:;
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":339 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":339 */
       __pyx_3 = __pyx_v_multi->size;
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":340 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":340 */
         __pyx_v_on_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":341 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":341 */
         __pyx_v_op_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,2));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":342 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":342 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_on_data[0]),(__pyx_v_op_data[0]));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":343 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":343 */
         PyArray_MultiIter_NEXTi(__pyx_v_multi,1);
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":344 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":344 */
         PyArray_MultiIter_NEXTi(__pyx_v_multi,2);
         __pyx_L11:;
       }
@@ -1199,7 +1210,7 @@
   }
   __pyx_L3:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":346 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":346 */
   Py_INCREF(((PyObject *)arrayObject));
   __pyx_r = ((PyObject *)arrayObject);
   goto __pyx_L0;
@@ -1248,10 +1259,10 @@
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":360 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":360 */
   __pyx_v_scalar = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":361 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":361 */
   __pyx_1 = (__pyx_v_on->nd == 0);
   if (__pyx_1) {
     __pyx_1 = (__pyx_v_om->nd == 0);
@@ -1261,30 +1272,30 @@
   }
   if (__pyx_1) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":362 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":362 */
     __pyx_v_scalar = 1;
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":363 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":363 */
     __pyx_v_on_data = ((long (*))__pyx_v_on->data);
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":364 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":364 */
     __pyx_v_om_data = ((long (*))__pyx_v_om->data);
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":365 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":365 */
     __pyx_v_oN_data = ((long (*))__pyx_v_oN->data);
     goto __pyx_L2;
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":367 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":367 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":368 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":368 */
     __pyx_1 = __pyx_v_scalar;
     if (__pyx_1) {
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":369 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":369 */
       __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state,(__pyx_v_on_data[0]),(__pyx_v_om_data[0]),(__pyx_v_oN_data[0]))); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 369; goto __pyx_L1;}
       __pyx_r = __pyx_2;
       __pyx_2 = 0;
@@ -1293,40 +1304,40 @@
     }
     /*else*/ {
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":371 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":371 */
       __pyx_2 = PyArray_MultiIterNew(3,((void (*))__pyx_v_on),((void (*))__pyx_v_om),((void (*))__pyx_v_oN)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 371; goto __pyx_L1;}
       Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_2)));
       Py_DECREF(((PyObject *)__pyx_v_multi));
       __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_2);
       Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":372 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":372 */
       __pyx_2 = PyArray_SimpleNew(__pyx_v_multi->nd,__pyx_v_multi->dimensions,NPY_LONG); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 372; goto __pyx_L1;}
       Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
       Py_DECREF(((PyObject *)arrayObject));
       arrayObject = ((PyArrayObject *)__pyx_2);
       Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":373 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":373 */
       __pyx_v_array_data = ((long (*))arrayObject->data);
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":374 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":374 */
       __pyx_3 = __pyx_v_multi->size;
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":375 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":375 */
         __pyx_v_on_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,0));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":376 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":376 */
         __pyx_v_om_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":377 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":377 */
         __pyx_v_oN_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,2));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":378 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":378 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_on_data[0]),(__pyx_v_om_data[0]),(__pyx_v_oN_data[0]));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":379 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":379 */
         PyArray_MultiIter_NEXT(__pyx_v_multi);
         __pyx_L5:;
       }
@@ -1337,7 +1348,7 @@
   }
   /*else*/ {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":381 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":381 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 381; goto __pyx_L1;}
     __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 381; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -1347,7 +1358,7 @@
     PyTuple_SET_ITEM(__pyx_5, 0, __pyx_v_size);
     PyTuple_SET_ITEM(__pyx_5, 1, __pyx_2);
     __pyx_2 = 0;
-    __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 381; goto __pyx_L1;}
+    __pyx_2 = PyObject_Call(__pyx_4, __pyx_5, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 381; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     Py_DECREF(__pyx_5); __pyx_5 = 0;
     Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
@@ -1355,20 +1366,20 @@
     arrayObject = ((PyArrayObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":382 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":382 */
     __pyx_v_array_data = ((long (*))arrayObject->data);
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":383 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":383 */
     __pyx_1 = __pyx_v_scalar;
     if (__pyx_1) {
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":384 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":384 */
       __pyx_v_length = PyArray_SIZE(arrayObject);
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":385 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":385 */
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":386 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":386 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_on_data[0]),(__pyx_v_om_data[0]),(__pyx_v_oN_data[0]));
         __pyx_L8:;
       }
@@ -1377,23 +1388,23 @@
     }
     /*else*/ {
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":388 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":388 */
       __pyx_4 = PyArray_MultiIterNew(4,((void (*))arrayObject),((void (*))__pyx_v_on),((void (*))__pyx_v_om),((void (*))__pyx_v_oN)); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 388; goto __pyx_L1;}
       Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_4)));
       Py_DECREF(((PyObject *)__pyx_v_multi));
       __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_4);
       Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":390 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":390 */
       __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
       if (__pyx_1) {
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":391 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":391 */
         __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 391; goto __pyx_L1;}
         __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 391; goto __pyx_L1;}
         Py_INCREF(__pyx_k64p);
         PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k64p);
-        __pyx_4 = PyObject_CallObject(__pyx_5, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 391; goto __pyx_L1;}
+        __pyx_4 = PyObject_Call(__pyx_5, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 391; goto __pyx_L1;}
         Py_DECREF(__pyx_5); __pyx_5 = 0;
         Py_DECREF(__pyx_2); __pyx_2 = 0;
         __Pyx_Raise(__pyx_4, 0, 0);
@@ -1403,23 +1414,23 @@
       }
       __pyx_L10:;
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":392 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":392 */
       __pyx_3 = __pyx_v_multi->size;
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":393 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":393 */
         __pyx_v_on_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":394 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":394 */
         __pyx_v_om_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,2));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":395 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":395 */
         __pyx_v_oN_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,3));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":396 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":396 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_on_data[0]),(__pyx_v_om_data[0]),(__pyx_v_oN_data[0]));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":397 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":397 */
         PyArray_MultiIter_NEXT(__pyx_v_multi);
         __pyx_L11:;
       }
@@ -1429,7 +1440,7 @@
   }
   __pyx_L3:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":399 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":399 */
   Py_INCREF(((PyObject *)arrayObject));
   __pyx_r = ((PyObject *)arrayObject);
   goto __pyx_L0;
@@ -1477,31 +1488,31 @@
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_itera = ((PyArrayIterObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":411 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":411 */
   __pyx_v_scalar = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":412 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":412 */
   __pyx_1 = (__pyx_v_oa->nd == 0);
   if (__pyx_1) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":413 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":413 */
     __pyx_v_oa_data = ((double (*))__pyx_v_oa->data);
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":414 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":414 */
     __pyx_v_scalar = 1;
     goto __pyx_L2;
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":416 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":416 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":417 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":417 */
     __pyx_1 = __pyx_v_scalar;
     if (__pyx_1) {
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":418 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":418 */
       __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]))); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 418; goto __pyx_L1;}
       __pyx_r = __pyx_2;
       __pyx_2 = 0;
@@ -1510,33 +1521,33 @@
     }
     /*else*/ {
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":420 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":420 */
       __pyx_2 = PyArray_SimpleNew(__pyx_v_oa->nd,__pyx_v_oa->dimensions,NPY_LONG); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 420; goto __pyx_L1;}
       Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
       Py_DECREF(((PyObject *)arrayObject));
       arrayObject = ((PyArrayObject *)__pyx_2);
       Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":421 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":421 */
       __pyx_v_length = PyArray_SIZE(arrayObject);
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":422 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":422 */
       __pyx_v_array_data = ((long (*))arrayObject->data);
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":423 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":423 */
       __pyx_2 = PyArray_IterNew(((PyObject *)__pyx_v_oa)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 423; goto __pyx_L1;}
       Py_INCREF(((PyObject *)((PyArrayIterObject *)__pyx_2)));
       Py_DECREF(((PyObject *)__pyx_v_itera));
       __pyx_v_itera = ((PyArrayIterObject *)__pyx_2);
       Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":424 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":424 */
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":425 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":425 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(((double (*))__pyx_v_itera->dataptr)[0]));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":426 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":426 */
         PyArray_ITER_NEXT(__pyx_v_itera);
         __pyx_L5:;
       }
@@ -1547,7 +1558,7 @@
   }
   /*else*/ {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":428 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":428 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 428; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 428; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -1557,7 +1568,7 @@
     PyTuple_SET_ITEM(__pyx_4, 0, __pyx_v_size);
     PyTuple_SET_ITEM(__pyx_4, 1, __pyx_2);
     __pyx_2 = 0;
-    __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 428; goto __pyx_L1;}
+    __pyx_2 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 428; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
@@ -1565,20 +1576,20 @@
     arrayObject = ((PyArrayObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":429 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":429 */
     __pyx_v_array_data = ((long (*))arrayObject->data);
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":430 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":430 */
     __pyx_1 = __pyx_v_scalar;
     if (__pyx_1) {
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":431 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":431 */
       __pyx_v_length = PyArray_SIZE(arrayObject);
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":432 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":432 */
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":433 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":433 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]));
         __pyx_L8:;
       }
@@ -1587,23 +1598,23 @@
     }
     /*else*/ {
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":435 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":435 */
       __pyx_3 = PyArray_MultiIterNew(2,((void (*))arrayObject),((void (*))__pyx_v_oa)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 435; goto __pyx_L1;}
       Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_3)));
       Py_DECREF(((PyObject *)__pyx_v_multi));
       __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_3);
       Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":436 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":436 */
       __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
       if (__pyx_1) {
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":437 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":437 */
         __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 437; goto __pyx_L1;}
         __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 437; goto __pyx_L1;}
         Py_INCREF(__pyx_k65p);
         PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k65p);
-        __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 437; goto __pyx_L1;}
+        __pyx_3 = PyObject_Call(__pyx_4, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 437; goto __pyx_L1;}
         Py_DECREF(__pyx_4); __pyx_4 = 0;
         Py_DECREF(__pyx_2); __pyx_2 = 0;
         __Pyx_Raise(__pyx_3, 0, 0);
@@ -1613,17 +1624,17 @@
       }
       __pyx_L10:;
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":438 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":438 */
       __pyx_5 = __pyx_v_multi->size;
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_5; ++__pyx_v_i) {
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":439 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":439 */
         __pyx_v_oa_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":440 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":440 */
         (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]));
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":441 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":441 */
         PyArray_MultiIter_NEXTi(__pyx_v_multi,1);
         __pyx_L11:;
       }
@@ -1633,7 +1644,7 @@
   }
   __pyx_L3:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":442 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":442 */
   Py_INCREF(((PyObject *)arrayObject));
   __pyx_r = ((PyObject *)arrayObject);
   goto __pyx_L0;
@@ -1663,31 +1674,31 @@
   long __pyx_v_i;
   double __pyx_r;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":447 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":447 */
   __pyx_v_sum = (__pyx_v_darr[0]);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":448 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":448 */
   __pyx_v_c = 0.0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":449 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":449 */
   for (__pyx_v_i = 1; __pyx_v_i < __pyx_v_n; ++__pyx_v_i) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":450 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":450 */
     __pyx_v_y = ((__pyx_v_darr[__pyx_v_i]) - __pyx_v_c);
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":451 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":451 */
     __pyx_v_t = (__pyx_v_sum + __pyx_v_y);
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":452 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":452 */
     __pyx_v_c = ((__pyx_v_t - __pyx_v_sum) - __pyx_v_y);
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":453 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":453 */
     __pyx_v_sum = __pyx_v_t;
     __pyx_L2:;
   }
   __pyx_L3:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":454 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":454 */
   __pyx_r = __pyx_v_sum;
   goto __pyx_L0;
 
@@ -1712,15 +1723,15 @@
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_seed);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":477 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":477 */
   ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state = ((rk_state (*))PyMem_Malloc((sizeof(rk_state ))));
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":479 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":479 */
   __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_seed); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 479; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 479; goto __pyx_L1;}
   Py_INCREF(__pyx_v_seed);
   PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_seed);
-  __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 479; goto __pyx_L1;}
+  __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 479; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
@@ -1744,14 +1755,14 @@
   int __pyx_1;
   Py_INCREF(__pyx_v_self);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":482 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":482 */
   __pyx_1 = (((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state != 0);
   if (__pyx_1) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":483 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":483 */
     PyMem_Free(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":484 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":484 */
     ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state = 0;
     goto __pyx_L2;
   }
@@ -1785,11 +1796,11 @@
   Py_INCREF(__pyx_v_seed);
   arrayObject_obj = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":498 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":498 */
   __pyx_1 = __pyx_v_seed == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":499 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":499 */
     __pyx_v_errcode = rk_randomseed(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
     goto __pyx_L2;
   }
@@ -1797,7 +1808,7 @@
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 500; goto __pyx_L1;}
   Py_INCREF(__pyx_v_seed);
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_seed);
-  __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 500; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 500; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 500; goto __pyx_L1;}
@@ -1806,21 +1817,21 @@
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_1) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":501 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":501 */
     __pyx_5 = PyInt_AsUnsignedLongMask(__pyx_v_seed); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 501; goto __pyx_L1;}
     rk_seed(__pyx_5,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
     goto __pyx_L2;
   }
   /*else*/ {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":503 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":503 */
     __pyx_3 = PyArray_ContiguousFromObject(__pyx_v_seed,NPY_LONG,1,1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 503; goto __pyx_L1;}
     Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
     Py_DECREF(((PyObject *)arrayObject_obj));
     arrayObject_obj = ((PyArrayObject *)__pyx_3);
     Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":504 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":504 */
     init_by_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,((unsigned long (*))arrayObject_obj->data),(arrayObject_obj->dimensions[0]));
   }
   __pyx_L2:;
@@ -1857,7 +1868,7 @@
   Py_INCREF(__pyx_v_self);
   arrayObject_state = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":513 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":513 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 513; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_empty); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 513; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -1868,7 +1879,7 @@
   PyTuple_SET_ITEM(__pyx_4, 1, __pyx_3);
   __pyx_1 = 0;
   __pyx_3 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 513; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_2, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 513; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
@@ -1876,10 +1887,10 @@
   arrayObject_state = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":514 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":514 */
   memcpy(((void (*))arrayObject_state->data),((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->key,(624 * (sizeof(long ))));
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":515 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":515 */
   __pyx_3 = PyInt_FromLong(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->pos); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 515; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 515; goto __pyx_L1;}
   Py_INCREF(__pyx_n_MT19937);
@@ -1934,7 +1945,7 @@
   __pyx_v_algorithm_name = Py_None; Py_INCREF(Py_None);
   __pyx_v_key = Py_None; Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":526 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":526 */
   __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 526; goto __pyx_L1;}
   __pyx_2 = PyObject_GetItem(__pyx_v_state, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 526; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -1942,17 +1953,17 @@
   __pyx_v_algorithm_name = __pyx_2;
   __pyx_2 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":527 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":527 */
   if (PyObject_Cmp(__pyx_v_algorithm_name, __pyx_n_MT19937, &__pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 527; goto __pyx_L1;}
   __pyx_3 = __pyx_3 != 0;
   if (__pyx_3) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":528 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":528 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; goto __pyx_L1;}
     Py_INCREF(__pyx_k68p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k68p);
-    __pyx_4 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; goto __pyx_L1;}
+    __pyx_4 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_4, 0, 0);
@@ -1962,8 +1973,8 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":529 */
-  __pyx_1 = PySequence_GetSlice(__pyx_v_state, 1, 0x7fffffff); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; goto __pyx_L1;}
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":529 */
+  __pyx_1 = PySequence_GetSlice(__pyx_v_state, 1, PY_SSIZE_T_MAX); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; goto __pyx_L1;}
   __pyx_2 = __Pyx_UnpackItem(__pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; goto __pyx_L1;}
   Py_DECREF(__pyx_v_key);
   __pyx_v_key = __pyx_2;
@@ -1975,23 +1986,23 @@
   if (__Pyx_EndUnpack(__pyx_1, 2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":530 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":530 */
   __pyx_4 = PyArray_ContiguousFromObject(__pyx_v_key,NPY_LONG,1,1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 530; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4)));
   Py_DECREF(((PyObject *)arrayObject_obj));
   arrayObject_obj = ((PyArrayObject *)__pyx_4);
   Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":531 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":531 */
   __pyx_3 = ((arrayObject_obj->dimensions[0]) != 624);
   if (__pyx_3) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":532 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":532 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 532; goto __pyx_L1;}
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 532; goto __pyx_L1;}
     Py_INCREF(__pyx_k69p);
     PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k69p);
-    __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 532; goto __pyx_L1;}
+    __pyx_4 = PyObject_Call(__pyx_2, __pyx_1, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 532; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     __Pyx_Raise(__pyx_4, 0, 0);
@@ -2001,10 +2012,10 @@
   }
   __pyx_L3:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":533 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":533 */
   memcpy(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->key,((void (*))arrayObject_obj->data),(624 * (sizeof(long ))));
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":534 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":534 */
   ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->pos = __pyx_v_pos;
 
   __pyx_r = Py_None; Py_INCREF(Py_None);
@@ -2034,10 +2045,10 @@
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0;
   Py_INCREF(__pyx_v_self);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":538 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":538 */
   __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_get_state); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 538; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 538; goto __pyx_L1;}
-  __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 538; goto __pyx_L1;}
+  __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 538; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_r = __pyx_3;
@@ -2069,12 +2080,12 @@
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_state);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":541 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":541 */
   __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_set_state); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 541; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 541; goto __pyx_L1;}
   Py_INCREF(__pyx_v_state);
   PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_state);
-  __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 541; goto __pyx_L1;}
+  __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 541; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
@@ -2108,7 +2119,7 @@
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0;
   Py_INCREF(__pyx_v_self);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":544 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":544 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_random); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -2117,7 +2128,7 @@
   __pyx_2 = PyTuple_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_v_self, __pyx_n_get_state); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; goto __pyx_L1;}
   __pyx_4 = PyTuple_New(0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; goto __pyx_L1;}
-  __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; goto __pyx_L1;}
+  __pyx_5 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_3 = PyTuple_New(3); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; goto __pyx_L1;}
@@ -2158,7 +2169,7 @@
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":552 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":552 */
   __pyx_1 = __pyx_f_6mtrand_cont0_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_double,__pyx_v_size); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 552; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
@@ -2188,7 +2199,7 @@
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":559 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":559 */
   __pyx_1 = __pyx_f_6mtrand_disc0_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_long,__pyx_v_size); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 559; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
@@ -2239,43 +2250,43 @@
   Py_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":574 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":574 */
   __pyx_1 = __pyx_v_high == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":575 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":575 */
     __pyx_v_lo = 0;
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":576 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":576 */
     __pyx_2 = PyInt_AsLong(__pyx_v_low); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 576; goto __pyx_L1;}
     __pyx_v_hi = __pyx_2;
     goto __pyx_L2;
   }
   /*else*/ {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":578 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":578 */
     __pyx_2 = PyInt_AsLong(__pyx_v_low); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 578; goto __pyx_L1;}
     __pyx_v_lo = __pyx_2;
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":579 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":579 */
     __pyx_2 = PyInt_AsLong(__pyx_v_high); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 579; goto __pyx_L1;}
     __pyx_v_hi = __pyx_2;
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":581 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":581 */
   __pyx_v_diff = ((__pyx_v_hi - __pyx_v_lo) - 1);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":582 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":582 */
   __pyx_1 = (__pyx_v_diff < 0);
   if (__pyx_1) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":583 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":583 */
     __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 583; goto __pyx_L1;}
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 583; goto __pyx_L1;}
     Py_INCREF(__pyx_k70p);
     PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k70p);
-    __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 583; goto __pyx_L1;}
+    __pyx_5 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 583; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     __Pyx_Raise(__pyx_5, 0, 0);
@@ -2285,11 +2296,11 @@
   }
   __pyx_L3:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":585 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":585 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":586 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":586 */
     __pyx_3 = PyLong_FromUnsignedLong((rk_interval(__pyx_v_diff,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state) + __pyx_v_lo)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 586; goto __pyx_L1;}
     __pyx_r = __pyx_3;
     __pyx_3 = 0;
@@ -2298,7 +2309,7 @@
   }
   /*else*/ {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":588 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":588 */
     __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 588; goto __pyx_L1;}
     __pyx_5 = PyObject_GetAttr(__pyx_4, __pyx_n_empty); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 588; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -2308,7 +2319,7 @@
     PyTuple_SET_ITEM(__pyx_4, 0, __pyx_v_size);
     PyTuple_SET_ITEM(__pyx_4, 1, __pyx_3);
     __pyx_3 = 0;
-    __pyx_3 = PyObject_CallObject(__pyx_5, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 588; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_5, __pyx_4, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 588; goto __pyx_L1;}
     Py_DECREF(__pyx_5); __pyx_5 = 0;
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
@@ -2316,22 +2327,22 @@
     arrayObject = ((PyArrayObject *)__pyx_3);
     Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":589 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":589 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":590 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":590 */
     __pyx_v_array_data = ((long (*))arrayObject->data);
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":591 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":591 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":592 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":592 */
       (__pyx_v_array_data[__pyx_v_i]) = (__pyx_v_lo + ((long )rk_interval(__pyx_v_diff,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state)));
       __pyx_L5:;
     }
     __pyx_L6:;
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":593 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":593 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
@@ -2368,22 +2379,22 @@
   Py_INCREF(__pyx_v_self);
   __pyx_v_bytestring = Py_None; Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":601 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":601 */
   __pyx_v_bytes = PyMem_Malloc(__pyx_v_length);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":602 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":602 */
   rk_fill(__pyx_v_bytes,__pyx_v_length,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":603 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":603 */
   __pyx_1 = PyString_FromStringAndSize(((char (*))__pyx_v_bytes),__pyx_v_length); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 603; goto __pyx_L1;}
   Py_DECREF(__pyx_v_bytestring);
   __pyx_v_bytestring = __pyx_1;
   __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":604 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":604 */
   PyMem_Free(__pyx_v_bytes);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":605 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":605 */
   Py_INCREF(__pyx_v_bytestring);
   __pyx_r = __pyx_v_bytestring;
   goto __pyx_L0;
@@ -2430,21 +2441,21 @@
   __pyx_v_odiff = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_temp = Py_None; Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":616 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":616 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_low,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 616; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_olow));
   __pyx_v_olow = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":617 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":617 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_high,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 617; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_ohigh));
   __pyx_v_ohigh = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":618 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":618 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 618; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_subtract); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 618; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -2453,24 +2464,24 @@
   PyTuple_SET_ITEM(__pyx_1, 0, ((PyObject *)__pyx_v_ohigh));
   Py_INCREF(((PyObject *)__pyx_v_olow));
   PyTuple_SET_ITEM(__pyx_1, 1, ((PyObject *)__pyx_v_olow));
-  __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 618; goto __pyx_L1;}
+  __pyx_3 = PyObject_Call(__pyx_2, __pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 618; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_v_temp);
   __pyx_v_temp = __pyx_3;
   __pyx_3 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":619 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":619 */
   Py_INCREF(__pyx_v_temp);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":621 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":621 */
   __pyx_2 = PyArray_EnsureArray(__pyx_v_temp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 621; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
   Py_DECREF(((PyObject *)__pyx_v_odiff));
   __pyx_v_odiff = ((PyArrayObject *)__pyx_2);
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":622 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":622 */
   __pyx_1 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_uniform,__pyx_v_size,__pyx_v_olow,__pyx_v_odiff); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 622; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
@@ -2520,12 +2531,12 @@
   }
   Py_INCREF(__pyx_v_self);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":635 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":635 */
   __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 635; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 635; goto __pyx_L1;}
   Py_INCREF(__pyx_v_args);
   PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_args);
-  __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 635; goto __pyx_L1;}
+  __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 635; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 635; goto __pyx_L1;}
@@ -2535,10 +2546,10 @@
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_4) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":636 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":636 */
     __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_random_sample); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 636; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 636; goto __pyx_L1;}
-    __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 636; goto __pyx_L1;}
+    __pyx_1 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 636; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     __pyx_r = __pyx_1;
@@ -2548,7 +2559,7 @@
   }
   /*else*/ {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":638 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":638 */
     __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_random_sample); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 638; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 638; goto __pyx_L1;}
     __pyx_1 = PyDict_New(); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 638; goto __pyx_L1;}
@@ -2599,12 +2610,12 @@
   }
   Py_INCREF(__pyx_v_self);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":650 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":650 */
   __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 650; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 650; goto __pyx_L1;}
   Py_INCREF(__pyx_v_args);
   PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_args);
-  __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 650; goto __pyx_L1;}
+  __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 650; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 650; goto __pyx_L1;}
@@ -2614,10 +2625,10 @@
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_4) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":651 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":651 */
     __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_standard_normal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 651; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 651; goto __pyx_L1;}
-    __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 651; goto __pyx_L1;}
+    __pyx_1 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 651; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     __pyx_r = __pyx_1;
@@ -2627,12 +2638,12 @@
   }
   /*else*/ {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":653 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":653 */
     __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_standard_normal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 653; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 653; goto __pyx_L1;}
     Py_INCREF(__pyx_v_args);
     PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_args);
-    __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 653; goto __pyx_L1;}
+    __pyx_1 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 653; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     __pyx_r = __pyx_1;
@@ -2677,16 +2688,16 @@
   Py_INCREF(__pyx_v_high);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":662 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":662 */
   __pyx_1 = __pyx_v_high == Py_None;
   if (__pyx_1) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":663 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":663 */
     Py_INCREF(__pyx_v_low);
     Py_DECREF(__pyx_v_high);
     __pyx_v_high = __pyx_v_low;
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":664 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":664 */
     __pyx_2 = PyInt_FromLong(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 664; goto __pyx_L1;}
     Py_DECREF(__pyx_v_low);
     __pyx_v_low = __pyx_2;
@@ -2695,7 +2706,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":665 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":665 */
   __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_randint); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 665; goto __pyx_L1;}
   __pyx_3 = PyInt_FromLong(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 665; goto __pyx_L1;}
   __pyx_4 = PyNumber_Add(__pyx_v_high, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 665; goto __pyx_L1;}
@@ -2707,7 +2718,7 @@
   Py_INCREF(__pyx_v_size);
   PyTuple_SET_ITEM(__pyx_3, 2, __pyx_v_size);
   __pyx_4 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 665; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 665; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_r = __pyx_4;
@@ -2742,7 +2753,7 @@
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":673 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":673 */
   __pyx_1 = __pyx_f_6mtrand_cont0_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_gauss,__pyx_v_size); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 673; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
@@ -2793,21 +2804,21 @@
   __pyx_v_oloc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":682 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":682 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_loc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 682; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_oloc));
   __pyx_v_oloc = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":683 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":683 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 683; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_oscale));
   __pyx_v_oscale = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":684 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":684 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 684; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 684; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -2820,25 +2831,25 @@
   PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_oscale));
   PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1);
   __pyx_1 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 684; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 684; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 684; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
   __pyx_1 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 684; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 684; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 684; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":685 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":685 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 685; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 685; goto __pyx_L1;}
     Py_INCREF(__pyx_k72p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k72p);
-    __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 685; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 685; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -2848,7 +2859,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":686 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":686 */
   __pyx_4 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_normal,__pyx_v_size,__pyx_v_oloc,__pyx_v_oscale); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 686; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -2903,21 +2914,21 @@
   __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_ob = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":695 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":695 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_a,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 695; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_oa));
   __pyx_v_oa = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":696 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":696 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_b,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 696; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_ob));
   __pyx_v_ob = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":698 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":698 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 698; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 698; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -2930,25 +2941,25 @@
   PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_oa));
   PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1);
   __pyx_1 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 698; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 698; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 698; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
   __pyx_1 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 698; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 698; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 698; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":699 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":699 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 699; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 699; goto __pyx_L1;}
     Py_INCREF(__pyx_k73p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k73p);
-    __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 699; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 699; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -2958,7 +2969,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":700 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":700 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 700; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 700; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -2971,25 +2982,25 @@
   PyTuple_SET_ITEM(__pyx_2, 0, ((PyObject *)__pyx_v_ob));
   PyTuple_SET_ITEM(__pyx_2, 1, __pyx_4);
   __pyx_4 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 700; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_3, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 700; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 700; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4);
   __pyx_4 = 0;
-  __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 700; goto __pyx_L1;}
+  __pyx_2 = PyObject_Call(__pyx_1, __pyx_3, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 700; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_2); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 700; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":701 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":701 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 701; goto __pyx_L1;}
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 701; goto __pyx_L1;}
     Py_INCREF(__pyx_k74p);
     PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k74p);
-    __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 701; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_4, __pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 701; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -2999,7 +3010,7 @@
   }
   __pyx_L3:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":702 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":702 */
   __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_beta,__pyx_v_size,__pyx_v_oa,__pyx_v_ob); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 702; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -3049,14 +3060,14 @@
   Py_INCREF(__pyx_v_size);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":710 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":710 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 710; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_oscale));
   __pyx_v_oscale = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":711 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":711 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -3069,25 +3080,25 @@
   PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_oscale));
   PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1);
   __pyx_1 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
   __pyx_1 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":712 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":712 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 712; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 712; goto __pyx_L1;}
     Py_INCREF(__pyx_k75p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k75p);
-    __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 712; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 712; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -3097,7 +3108,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":713 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":713 */
   __pyx_4 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_exponential,__pyx_v_size,__pyx_v_oscale); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 713; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -3132,7 +3143,7 @@
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":720 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":720 */
   __pyx_1 = __pyx_f_6mtrand_cont0_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_exponential,__pyx_v_size); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 720; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
@@ -3174,14 +3185,14 @@
   Py_INCREF(__pyx_v_size);
   __pyx_v_oshape = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":728 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":728 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_shape,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 728; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_oshape));
   __pyx_v_oshape = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":729 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":729 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -3194,25 +3205,25 @@
   PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_oshape));
   PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1);
   __pyx_1 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
   __pyx_1 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":730 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":730 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 730; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 730; goto __pyx_L1;}
     Py_INCREF(__pyx_k76p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k76p);
-    __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 730; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 730; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -3222,7 +3233,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":731 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":731 */
   __pyx_4 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_gamma,__pyx_v_size,__pyx_v_oshape); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -3276,21 +3287,21 @@
   __pyx_v_oshape = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":740 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":740 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_shape,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 740; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_oshape));
   __pyx_v_oshape = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":741 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":741 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 741; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_oscale));
   __pyx_v_oscale = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":742 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":742 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -3303,25 +3314,25 @@
   PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_oshape));
   PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1);
   __pyx_1 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
   __pyx_1 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":743 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":743 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 743; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 743; goto __pyx_L1;}
     Py_INCREF(__pyx_k77p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k77p);
-    __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 743; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 743; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -3331,7 +3342,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":744 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":744 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 744; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 744; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -3344,25 +3355,25 @@
   PyTuple_SET_ITEM(__pyx_2, 0, ((PyObject *)__pyx_v_oscale));
   PyTuple_SET_ITEM(__pyx_2, 1, __pyx_4);
   __pyx_4 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 744; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_3, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 744; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 744; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4);
   __pyx_4 = 0;
-  __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 744; goto __pyx_L1;}
+  __pyx_2 = PyObject_Call(__pyx_1, __pyx_3, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 744; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_2); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 744; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":745 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":745 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 745; goto __pyx_L1;}
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 745; goto __pyx_L1;}
     Py_INCREF(__pyx_k78p);
     PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k78p);
-    __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 745; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_4, __pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 745; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -3372,7 +3383,7 @@
   }
   __pyx_L3:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":746 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":746 */
   __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_gamma,__pyx_v_size,__pyx_v_oshape,__pyx_v_oscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 746; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -3427,21 +3438,21 @@
   __pyx_v_odfnum = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_odfden = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":755 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":755 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_dfnum,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 755; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_odfnum));
   __pyx_v_odfnum = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":756 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":756 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_dfden,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 756; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_odfden));
   __pyx_v_odfden = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":757 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":757 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -3454,25 +3465,25 @@
   PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_odfnum));
   PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1);
   __pyx_1 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
   __pyx_1 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":758 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":758 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 758; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 758; goto __pyx_L1;}
     Py_INCREF(__pyx_k79p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k79p);
-    __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 758; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 758; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -3482,7 +3493,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":759 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":759 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 759; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 759; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -3495,25 +3506,25 @@
   PyTuple_SET_ITEM(__pyx_2, 0, ((PyObject *)__pyx_v_odfden));
   PyTuple_SET_ITEM(__pyx_2, 1, __pyx_4);
   __pyx_4 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 759; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_3, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 759; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 759; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4);
   __pyx_4 = 0;
-  __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 759; goto __pyx_L1;}
+  __pyx_2 = PyObject_Call(__pyx_1, __pyx_3, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 759; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_2); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 759; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":760 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":760 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 760; goto __pyx_L1;}
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 760; goto __pyx_L1;}
     Py_INCREF(__pyx_k80p);
     PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k80p);
-    __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 760; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_4, __pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 760; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -3523,7 +3534,7 @@
   }
   __pyx_L3:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":761 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":761 */
   __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_f,__pyx_v_size,__pyx_v_odfnum,__pyx_v_odfden); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 761; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -3586,28 +3597,28 @@
   __pyx_v_odfden = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_ononc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":771 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":771 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_dfnum,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 771; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_odfnum));
   __pyx_v_odfnum = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":772 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":772 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_dfden,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 772; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_odfden));
   __pyx_v_odfden = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":773 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":773 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_nonc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 773; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_ononc));
   __pyx_v_ononc = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":775 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":775 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 775; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 775; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -3620,25 +3631,25 @@
   PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_odfnum));
   PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1);
   __pyx_1 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 775; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 775; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 775; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
   __pyx_1 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 775; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 775; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 775; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":776 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":776 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 776; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 776; goto __pyx_L1;}
     Py_INCREF(__pyx_k81p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k81p);
-    __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 776; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 776; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -3648,7 +3659,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":777 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":777 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 777; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 777; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -3661,25 +3672,25 @@
   PyTuple_SET_ITEM(__pyx_2, 0, ((PyObject *)__pyx_v_odfden));
   PyTuple_SET_ITEM(__pyx_2, 1, __pyx_4);
   __pyx_4 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 777; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_3, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 777; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 777; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4);
   __pyx_4 = 0;
-  __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 777; goto __pyx_L1;}
+  __pyx_2 = PyObject_Call(__pyx_1, __pyx_3, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 777; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_2); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 777; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":778 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":778 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 778; goto __pyx_L1;}
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 778; goto __pyx_L1;}
     Py_INCREF(__pyx_k82p);
     PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k82p);
-    __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 778; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_4, __pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 778; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -3689,7 +3700,7 @@
   }
   __pyx_L3:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":779 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":779 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 779; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 779; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -3702,25 +3713,25 @@
   PyTuple_SET_ITEM(__pyx_1, 0, ((PyObject *)__pyx_v_ononc));
   PyTuple_SET_ITEM(__pyx_1, 1, __pyx_2);
   __pyx_2 = 0;
-  __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 779; goto __pyx_L1;}
+  __pyx_2 = PyObject_Call(__pyx_3, __pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 779; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 779; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2);
   __pyx_2 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 779; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_4, __pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 779; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_1); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 779; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":780 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":780 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 780; goto __pyx_L1;}
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 780; goto __pyx_L1;}
     Py_INCREF(__pyx_k83p);
     PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k83p);
-    __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 780; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_2, __pyx_4, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 780; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -3730,7 +3741,7 @@
   }
   __pyx_L4:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":781 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":781 */
   __pyx_1 = __pyx_f_6mtrand_cont3_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_noncentral_f,__pyx_v_size,__pyx_v_odfnum,__pyx_v_odfden,__pyx_v_ononc); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 781; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
@@ -3781,14 +3792,14 @@
   Py_INCREF(__pyx_v_size);
   __pyx_v_odf = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":790 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":790 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_df,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 790; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_odf));
   __pyx_v_odf = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":791 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":791 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 791; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 791; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -3801,25 +3812,25 @@
   PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_odf));
   PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1);
   __pyx_1 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 791; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 791; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 791; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
   __pyx_1 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 791; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 791; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 791; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":792 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":792 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 792; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 792; goto __pyx_L1;}
     Py_INCREF(__pyx_k84p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k84p);
-    __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 792; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 792; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -3829,7 +3840,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":793 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":793 */
   __pyx_4 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_chisquare,__pyx_v_size,__pyx_v_odf); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 793; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -3882,21 +3893,21 @@
   __pyx_v_odf = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_ononc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":802 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":802 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_df,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 802; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_odf));
   __pyx_v_odf = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":803 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":803 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_nonc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 803; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_ononc));
   __pyx_v_ononc = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":804 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":804 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 804; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 804; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -3909,25 +3920,25 @@
   PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_odf));
   PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1);
   __pyx_1 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 804; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 804; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 804; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
   __pyx_1 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 804; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 804; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 804; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":805 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":805 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 805; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 805; goto __pyx_L1;}
     Py_INCREF(__pyx_k85p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k85p);
-    __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 805; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 805; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -3937,7 +3948,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":806 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":806 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -3950,25 +3961,25 @@
   PyTuple_SET_ITEM(__pyx_2, 0, ((PyObject *)__pyx_v_ononc));
   PyTuple_SET_ITEM(__pyx_2, 1, __pyx_4);
   __pyx_4 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_3, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4);
   __pyx_4 = 0;
-  __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; goto __pyx_L1;}
+  __pyx_2 = PyObject_Call(__pyx_1, __pyx_3, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_2); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":807 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":807 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 807; goto __pyx_L1;}
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 807; goto __pyx_L1;}
     Py_INCREF(__pyx_k86p);
     PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k86p);
-    __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 807; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_4, __pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 807; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -3978,7 +3989,7 @@
   }
   __pyx_L3:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":808 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":808 */
   __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_noncentral_chisquare,__pyx_v_size,__pyx_v_odf,__pyx_v_ononc); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 808; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -4015,7 +4026,7 @@
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":816 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":816 */
   __pyx_1 = __pyx_f_6mtrand_cont0_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_cauchy,__pyx_v_size); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 816; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
@@ -4057,14 +4068,14 @@
   Py_INCREF(__pyx_v_size);
   __pyx_v_odf = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":824 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":824 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_df,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 824; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_odf));
   __pyx_v_odf = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":825 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":825 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 825; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 825; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -4077,25 +4088,25 @@
   PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_odf));
   PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1);
   __pyx_1 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 825; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 825; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 825; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
   __pyx_1 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 825; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 825; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 825; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":826 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":826 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 826; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 826; goto __pyx_L1;}
     Py_INCREF(__pyx_k87p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k87p);
-    __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 826; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 826; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -4105,7 +4116,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":827 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":827 */
   __pyx_4 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_t,__pyx_v_size,__pyx_v_odf); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 827; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -4156,21 +4167,21 @@
   __pyx_v_omu = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_okappa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":837 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":837 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_mu,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 837; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_omu));
   __pyx_v_omu = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":838 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":838 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_kappa,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 838; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_okappa));
   __pyx_v_okappa = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":839 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":839 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 839; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 839; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -4183,25 +4194,25 @@
   PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_okappa));
   PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1);
   __pyx_1 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 839; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 839; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 839; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
   __pyx_1 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 839; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 839; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 839; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":840 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":840 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 840; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 840; goto __pyx_L1;}
     Py_INCREF(__pyx_k88p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k88p);
-    __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 840; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 840; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -4211,7 +4222,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":841 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":841 */
   __pyx_4 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_vonmises,__pyx_v_size,__pyx_v_omu,__pyx_v_okappa); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 841; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -4260,14 +4271,14 @@
   Py_INCREF(__pyx_v_size);
   __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":849 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":849 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_a,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 849; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_oa));
   __pyx_v_oa = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":850 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":850 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 850; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 850; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -4280,25 +4291,25 @@
   PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_oa));
   PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1);
   __pyx_1 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 850; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 850; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 850; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
   __pyx_1 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 850; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 850; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 850; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":851 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":851 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 851; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 851; goto __pyx_L1;}
     Py_INCREF(__pyx_k89p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k89p);
-    __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 851; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 851; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -4308,7 +4319,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":852 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":852 */
   __pyx_4 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_pareto,__pyx_v_size,__pyx_v_oa); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 852; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -4354,7 +4365,7 @@
   Py_INCREF(__pyx_v_size);
   __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":860 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":860 */
   __pyx_1 = PyFloat_FromDouble(__pyx_v_a); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 860; goto __pyx_L1;}
   __pyx_2 = PyArray_FROM_OTF(__pyx_1,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 860; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -4363,7 +4374,7 @@
   __pyx_v_oa = ((PyArrayObject *)__pyx_2);
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":861 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":861 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 861; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 861; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -4376,25 +4387,25 @@
   PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_oa));
   PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1);
   __pyx_1 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 861; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 861; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 861; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
   __pyx_1 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 861; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 861; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 861; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":862 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":862 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 862; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 862; goto __pyx_L1;}
     Py_INCREF(__pyx_k90p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k90p);
-    __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 862; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 862; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -4404,7 +4415,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":863 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":863 */
   __pyx_4 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_weibull,__pyx_v_size,__pyx_v_oa); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 863; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -4449,7 +4460,7 @@
   Py_INCREF(__pyx_v_size);
   __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":871 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":871 */
   __pyx_1 = PyFloat_FromDouble(__pyx_v_a); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 871; goto __pyx_L1;}
   __pyx_2 = PyArray_FROM_OTF(__pyx_1,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 871; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -4458,7 +4469,7 @@
   __pyx_v_oa = ((PyArrayObject *)__pyx_2);
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":872 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":872 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 872; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 872; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -4471,25 +4482,25 @@
   PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_oa));
   PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1);
   __pyx_1 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 872; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 872; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 872; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
   __pyx_1 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 872; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 872; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 872; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":873 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":873 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 873; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 873; goto __pyx_L1;}
     Py_INCREF(__pyx_k91p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k91p);
-    __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 873; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 873; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -4499,7 +4510,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":874 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":874 */
   __pyx_4 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_power,__pyx_v_size,__pyx_v_oa); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 874; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -4551,21 +4562,21 @@
   __pyx_v_oloc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":883 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":883 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_loc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 883; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_1, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 883; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_oloc));
   __pyx_v_oloc = ((PyArrayObject *)__pyx_1);
   __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":884 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":884 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 884; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_1, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 884; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_oscale));
   __pyx_v_oscale = ((PyArrayObject *)__pyx_1);
   __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":885 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":885 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 885; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 885; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -4578,25 +4589,25 @@
   PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_oscale));
   PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1);
   __pyx_1 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 885; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 885; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 885; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
   __pyx_1 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 885; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 885; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 885; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":886 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":886 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 886; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 886; goto __pyx_L1;}
     Py_INCREF(__pyx_k92p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k92p);
-    __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 886; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 886; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -4606,7 +4617,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":887 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":887 */
   __pyx_4 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_laplace,__pyx_v_size,__pyx_v_oloc,__pyx_v_oscale); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 887; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -4661,21 +4672,21 @@
   __pyx_v_oloc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":896 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":896 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_loc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 896; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_1, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 896; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_oloc));
   __pyx_v_oloc = ((PyArrayObject *)__pyx_1);
   __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":897 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":897 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 897; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_1, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 897; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_oscale));
   __pyx_v_oscale = ((PyArrayObject *)__pyx_1);
   __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":898 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":898 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 898; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 898; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -4688,25 +4699,25 @@
   PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_oscale));
   PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1);
   __pyx_1 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 898; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 898; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 898; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
   __pyx_1 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 898; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 898; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 898; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":899 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":899 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 899; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 899; goto __pyx_L1;}
     Py_INCREF(__pyx_k93p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k93p);
-    __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 899; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 899; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -4716,7 +4727,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":900 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":900 */
   __pyx_4 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_gumbel,__pyx_v_size,__pyx_v_oloc,__pyx_v_oscale); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 900; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -4771,21 +4782,21 @@
   __pyx_v_oloc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":909 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":909 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_loc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 909; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_1, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 909; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_oloc));
   __pyx_v_oloc = ((PyArrayObject *)__pyx_1);
   __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":910 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":910 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 910; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_1, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 910; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_oscale));
   __pyx_v_oscale = ((PyArrayObject *)__pyx_1);
   __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":911 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":911 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 911; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 911; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -4798,25 +4809,25 @@
   PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_oscale));
   PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1);
   __pyx_1 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 911; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 911; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 911; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
   __pyx_1 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 911; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 911; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 911; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":912 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":912 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 912; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 912; goto __pyx_L1;}
     Py_INCREF(__pyx_k94p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k94p);
-    __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 912; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 912; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -4826,7 +4837,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":913 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":913 */
   __pyx_4 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_logistic,__pyx_v_size,__pyx_v_oloc,__pyx_v_oscale); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 913; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -4881,21 +4892,21 @@
   __pyx_v_omean = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_osigma = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":927 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":927 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_mean,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 927; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_1, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 927; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_omean));
   __pyx_v_omean = ((PyArrayObject *)__pyx_1);
   __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":928 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":928 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_sigma,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_1, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_osigma));
   __pyx_v_osigma = ((PyArrayObject *)__pyx_1);
   __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":929 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":929 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -4908,25 +4919,25 @@
   PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_osigma));
   PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1);
   __pyx_1 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
   __pyx_1 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":930 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":930 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; goto __pyx_L1;}
     Py_INCREF(__pyx_k95p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k95p);
-    __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -4936,7 +4947,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":931 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":931 */
   __pyx_4 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_lognormal,__pyx_v_size,__pyx_v_omean,__pyx_v_osigma); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 931; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -4986,14 +4997,14 @@
   Py_INCREF(__pyx_v_size);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":939 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":939 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 939; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_oscale));
   __pyx_v_oscale = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":940 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":940 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -5006,25 +5017,25 @@
   PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_oscale));
   PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1);
   __pyx_1 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
   __pyx_1 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":941 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":941 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 941; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 941; goto __pyx_L1;}
     Py_INCREF(__pyx_k96p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k96p);
-    __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 941; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 941; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -5034,7 +5045,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":942 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":942 */
   __pyx_4 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_rayleigh,__pyx_v_size,__pyx_v_oscale); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 942; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -5087,21 +5098,21 @@
   __pyx_v_omean = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":951 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":951 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_mean,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 951; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_1, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 951; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_omean));
   __pyx_v_omean = ((PyArrayObject *)__pyx_1);
   __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":952 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":952 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 952; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_1, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 952; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_oscale));
   __pyx_v_oscale = ((PyArrayObject *)__pyx_1);
   __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":953 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":953 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 953; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 953; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -5114,25 +5125,25 @@
   PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_omean));
   PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1);
   __pyx_1 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 953; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 953; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 953; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
   __pyx_1 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 953; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 953; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 953; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":954 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":954 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 954; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 954; goto __pyx_L1;}
     Py_INCREF(__pyx_k97p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k97p);
-    __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 954; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 954; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -5152,25 +5163,25 @@
   PyTuple_SET_ITEM(__pyx_2, 0, ((PyObject *)__pyx_v_oscale));
   PyTuple_SET_ITEM(__pyx_2, 1, __pyx_4);
   __pyx_4 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 955; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_3, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 955; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 955; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4);
   __pyx_4 = 0;
-  __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 955; goto __pyx_L1;}
+  __pyx_2 = PyObject_Call(__pyx_1, __pyx_3, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 955; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_2); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 955; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":956 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":956 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; goto __pyx_L1;}
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; goto __pyx_L1;}
     Py_INCREF(__pyx_k98p);
     PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k98p);
-    __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_4, __pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -5180,7 +5191,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":957 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":957 */
   __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_wald,__pyx_v_size,__pyx_v_omean,__pyx_v_oscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 957; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -5244,28 +5255,28 @@
   __pyx_v_omode = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_oright = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":968 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":968 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_left,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 968; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_oleft));
   __pyx_v_oleft = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":969 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":969 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_mode,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 969; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_omode));
   __pyx_v_omode = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":970 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":970 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_right,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 970; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_oright));
   __pyx_v_oright = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":972 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":972 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 972; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 972; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -5277,25 +5288,25 @@
   PyTuple_SET_ITEM(__pyx_1, 0, ((PyObject *)__pyx_v_oleft));
   Py_INCREF(((PyObject *)__pyx_v_omode));
   PyTuple_SET_ITEM(__pyx_1, 1, ((PyObject *)__pyx_v_omode));
-  __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 972; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_3, __pyx_1, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 972; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 972; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4);
   __pyx_4 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 972; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 972; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_1); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 972; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":973 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":973 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 973; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 973; goto __pyx_L1;}
     Py_INCREF(__pyx_k99p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k99p);
-    __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 973; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_4, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 973; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -5305,7 +5316,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":974 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":974 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 974; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 974; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -5317,25 +5328,25 @@
   PyTuple_SET_ITEM(__pyx_1, 0, ((PyObject *)__pyx_v_omode));
   Py_INCREF(((PyObject *)__pyx_v_oright));
   PyTuple_SET_ITEM(__pyx_1, 1, ((PyObject *)__pyx_v_oright));
-  __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 974; goto __pyx_L1;}
+  __pyx_2 = PyObject_Call(__pyx_3, __pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 974; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 974; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2);
   __pyx_2 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 974; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_4, __pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 974; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_1); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 974; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":975 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":975 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 975; goto __pyx_L1;}
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 975; goto __pyx_L1;}
     Py_INCREF(__pyx_k100p);
     PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k100p);
-    __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 975; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_2, __pyx_4, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 975; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -5345,7 +5356,7 @@
   }
   __pyx_L3:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":976 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":976 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 976; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 976; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -5357,25 +5368,25 @@
   PyTuple_SET_ITEM(__pyx_1, 0, ((PyObject *)__pyx_v_oleft));
   Py_INCREF(((PyObject *)__pyx_v_oright));
   PyTuple_SET_ITEM(__pyx_1, 1, ((PyObject *)__pyx_v_oright));
-  __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 976; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_3, __pyx_1, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 976; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 976; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4);
   __pyx_4 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 976; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 976; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_1); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 976; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":977 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":977 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 977; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 977; goto __pyx_L1;}
     Py_INCREF(__pyx_k101p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k101p);
-    __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 977; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_4, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 977; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -5385,7 +5396,7 @@
   }
   __pyx_L4:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":978 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":978 */
   __pyx_1 = __pyx_f_6mtrand_cont3_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_triangular,__pyx_v_size,__pyx_v_oleft,__pyx_v_omode,__pyx_v_oright); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 978; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
@@ -5444,21 +5455,21 @@
   __pyx_v_on = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_op = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":989 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":989 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_n,NPY_LONG,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 989; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_on));
   __pyx_v_on = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":990 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":990 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_p,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 990; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_op));
   __pyx_v_op = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":991 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":991 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 991; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 991; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -5471,25 +5482,25 @@
   PyTuple_SET_ITEM(__pyx_4, 0, __pyx_v_n);
   PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1);
   __pyx_1 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 991; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 991; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 991; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
   __pyx_1 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 991; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 991; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 991; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":992 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":992 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 992; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 992; goto __pyx_L1;}
     Py_INCREF(__pyx_k102p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k102p);
-    __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 992; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 992; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -5499,7 +5510,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":993 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":993 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 993; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 993; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -5512,25 +5523,25 @@
   PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_p);
   PyTuple_SET_ITEM(__pyx_2, 1, __pyx_4);
   __pyx_4 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 993; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_3, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 993; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 993; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4);
   __pyx_4 = 0;
-  __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 993; goto __pyx_L1;}
+  __pyx_2 = PyObject_Call(__pyx_1, __pyx_3, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 993; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_2); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 993; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":994 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":994 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 994; goto __pyx_L1;}
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 994; goto __pyx_L1;}
     Py_INCREF(__pyx_k103p);
     PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k103p);
-    __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 994; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_4, __pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 994; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -5540,7 +5551,7 @@
   }
   __pyx_L3:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":995 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":995 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 995; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 995; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -5553,25 +5564,25 @@
   PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_p);
   PyTuple_SET_ITEM(__pyx_1, 1, __pyx_2);
   __pyx_2 = 0;
-  __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 995; goto __pyx_L1;}
+  __pyx_2 = PyObject_Call(__pyx_3, __pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 995; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 995; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2);
   __pyx_2 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 995; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_4, __pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 995; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_1); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 995; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":996 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":996 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 996; goto __pyx_L1;}
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 996; goto __pyx_L1;}
     Py_INCREF(__pyx_k104p);
     PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k104p);
-    __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 996; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_2, __pyx_4, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 996; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -5581,7 +5592,7 @@
   }
   __pyx_L4:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":997 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":997 */
   __pyx_1 = __pyx_f_6mtrand_discnp_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_binomial,__pyx_v_size,__pyx_v_on,__pyx_v_op); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 997; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
@@ -5638,21 +5649,21 @@
   __pyx_v_on = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_op = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1006 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1006 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_n,NPY_LONG,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1006; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_on));
   __pyx_v_on = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1007 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1007 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_p,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1007; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_op));
   __pyx_v_op = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1008 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1008 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1008; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1008; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -5665,25 +5676,25 @@
   PyTuple_SET_ITEM(__pyx_4, 0, __pyx_v_n);
   PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1);
   __pyx_1 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1008; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1008; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1008; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
   __pyx_1 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1008; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1008; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1008; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1009 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1009 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1009; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1009; goto __pyx_L1;}
     Py_INCREF(__pyx_k105p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k105p);
-    __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1009; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1009; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -5693,7 +5704,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1010 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1010 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1010; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1010; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -5706,25 +5717,25 @@
   PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_p);
   PyTuple_SET_ITEM(__pyx_2, 1, __pyx_4);
   __pyx_4 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1010; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_3, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1010; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1010; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4);
   __pyx_4 = 0;
-  __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1010; goto __pyx_L1;}
+  __pyx_2 = PyObject_Call(__pyx_1, __pyx_3, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1010; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_2); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1010; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1011 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1011 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1011; goto __pyx_L1;}
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1011; goto __pyx_L1;}
     Py_INCREF(__pyx_k106p);
     PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k106p);
-    __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1011; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_4, __pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1011; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -5734,7 +5745,7 @@
   }
   __pyx_L3:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1012 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1012 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1012; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1012; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -5747,25 +5758,25 @@
   PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_p);
   PyTuple_SET_ITEM(__pyx_1, 1, __pyx_2);
   __pyx_2 = 0;
-  __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1012; goto __pyx_L1;}
+  __pyx_2 = PyObject_Call(__pyx_3, __pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1012; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1012; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2);
   __pyx_2 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1012; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_4, __pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1012; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_1); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1012; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1013 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1013 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1013; goto __pyx_L1;}
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1013; goto __pyx_L1;}
     Py_INCREF(__pyx_k107p);
     PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k107p);
-    __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1013; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_2, __pyx_4, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1013; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -5775,7 +5786,7 @@
   }
   __pyx_L4:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1014 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1014 */
   __pyx_1 = __pyx_f_6mtrand_discnp_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_negative_binomial,__pyx_v_size,__pyx_v_on,__pyx_v_op); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1014; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
@@ -5825,14 +5836,14 @@
   Py_INCREF(__pyx_v_size);
   __pyx_v_olam = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1023 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1023 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_lam,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1023; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_olam));
   __pyx_v_olam = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1024 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1024 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1024; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1024; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -5845,25 +5856,25 @@
   PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_olam));
   PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1);
   __pyx_1 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1024; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1024; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1024; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
   __pyx_1 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1024; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1024; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1024; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1025 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1025 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1025; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1025; goto __pyx_L1;}
     Py_INCREF(__pyx_k108p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k108p);
-    __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1025; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1025; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -5873,7 +5884,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1026 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1026 */
   __pyx_4 = __pyx_f_6mtrand_discd_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_poisson,__pyx_v_size,__pyx_v_olam); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1026; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -5920,14 +5931,14 @@
   Py_INCREF(__pyx_v_size);
   __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1034 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1034 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_a,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1034; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_oa));
   __pyx_v_oa = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1035 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1035 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1035; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1035; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -5940,25 +5951,25 @@
   PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_oa));
   PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1);
   __pyx_1 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1035; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1035; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1035; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
   __pyx_1 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1035; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1035; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1035; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1036 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1036 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1036; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1036; goto __pyx_L1;}
     Py_INCREF(__pyx_k109p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k109p);
-    __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1036; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1036; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -5968,7 +5979,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1037 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1037 */
   __pyx_4 = __pyx_f_6mtrand_discd_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_zipf,__pyx_v_size,__pyx_v_oa); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1037; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -6017,14 +6028,14 @@
   Py_INCREF(__pyx_v_size);
   __pyx_v_op = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1046 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1046 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_p,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1046; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_op));
   __pyx_v_op = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1047 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1047 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1047; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1047; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -6037,25 +6048,25 @@
   PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_op));
   PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1);
   __pyx_1 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1047; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1047; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1047; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
   __pyx_1 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1047; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1047; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1047; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1048 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1048 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1048; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1048; goto __pyx_L1;}
     Py_INCREF(__pyx_k110p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k110p);
-    __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1048; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1048; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -6065,7 +6076,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1049 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1049 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1049; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1049; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -6078,25 +6089,25 @@
   PyTuple_SET_ITEM(__pyx_2, 0, ((PyObject *)__pyx_v_op));
   PyTuple_SET_ITEM(__pyx_2, 1, __pyx_4);
   __pyx_4 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1049; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_3, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1049; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1049; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4);
   __pyx_4 = 0;
-  __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1049; goto __pyx_L1;}
+  __pyx_2 = PyObject_Call(__pyx_1, __pyx_3, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1049; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_2); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1049; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1050 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1050 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1050; goto __pyx_L1;}
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1050; goto __pyx_L1;}
     Py_INCREF(__pyx_k111p);
     PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k111p);
-    __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1050; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_4, __pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1050; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -6106,7 +6117,7 @@
   }
   __pyx_L3:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1051 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1051 */
   __pyx_2 = __pyx_f_6mtrand_discd_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_geometric,__pyx_v_size,__pyx_v_op); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1051; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -6170,28 +6181,28 @@
   __pyx_v_onbad = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_onsample = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1067 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1067 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_ngood,NPY_LONG,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1067; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_ongood));
   __pyx_v_ongood = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1068 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1068 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_nbad,NPY_LONG,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1068; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_onbad));
   __pyx_v_onbad = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1069 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1069 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_nsample,NPY_LONG,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1069; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_onsample));
   __pyx_v_onsample = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1070 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1070 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1070; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1070; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -6204,25 +6215,25 @@
   PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_ongood));
   PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1);
   __pyx_1 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1070; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1070; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1070; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
   __pyx_1 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1070; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1070; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1070; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1071 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1071 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1071; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1071; goto __pyx_L1;}
     Py_INCREF(__pyx_k112p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k112p);
-    __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1071; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1071; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -6232,7 +6243,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1072 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1072 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1072; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1072; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -6245,25 +6256,25 @@
   PyTuple_SET_ITEM(__pyx_2, 0, ((PyObject *)__pyx_v_onbad));
   PyTuple_SET_ITEM(__pyx_2, 1, __pyx_4);
   __pyx_4 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1072; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_3, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1072; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1072; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4);
   __pyx_4 = 0;
-  __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1072; goto __pyx_L1;}
+  __pyx_2 = PyObject_Call(__pyx_1, __pyx_3, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1072; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_2); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1072; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1073 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1073 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1073; goto __pyx_L1;}
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1073; goto __pyx_L1;}
     Py_INCREF(__pyx_k113p);
     PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k113p);
-    __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1073; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_4, __pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1073; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -6273,7 +6284,7 @@
   }
   __pyx_L3:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1074 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1074 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1074; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1074; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -6288,7 +6299,7 @@
   PyTuple_SET_ITEM(__pyx_2, 0, ((PyObject *)__pyx_v_ongood));
   Py_INCREF(((PyObject *)__pyx_v_onbad));
   PyTuple_SET_ITEM(__pyx_2, 1, ((PyObject *)__pyx_v_onbad));
-  __pyx_6 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1074; goto __pyx_L1;}
+  __pyx_6 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1074; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_1 = PyTuple_New(2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1074; goto __pyx_L1;}
@@ -6296,25 +6307,25 @@
   Py_INCREF(((PyObject *)__pyx_v_onsample));
   PyTuple_SET_ITEM(__pyx_1, 1, ((PyObject *)__pyx_v_onsample));
   __pyx_6 = 0;
-  __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1074; goto __pyx_L1;}
+  __pyx_2 = PyObject_Call(__pyx_3, __pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1074; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   __pyx_6 = PyTuple_New(1); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1074; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_6, 0, __pyx_2);
   __pyx_2 = 0;
-  __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_6); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1074; goto __pyx_L1;}
+  __pyx_3 = PyObject_Call(__pyx_4, __pyx_6, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1074; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   Py_DECREF(__pyx_6); __pyx_6 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_3); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1074; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1075 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1075 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1075; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1075; goto __pyx_L1;}
     Py_INCREF(__pyx_k114p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k114p);
-    __pyx_4 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1075; goto __pyx_L1;}
+    __pyx_4 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1075; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_4, 0, 0);
@@ -6324,7 +6335,7 @@
   }
   __pyx_L4:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1076 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1076 */
   __pyx_6 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_6, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; goto __pyx_L1;}
   Py_DECREF(__pyx_6); __pyx_6 = 0;
@@ -6337,25 +6348,25 @@
   PyTuple_SET_ITEM(__pyx_6, 0, ((PyObject *)__pyx_v_onsample));
   PyTuple_SET_ITEM(__pyx_6, 1, __pyx_4);
   __pyx_4 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_6); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_2, __pyx_6, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_6); __pyx_6 = 0;
   __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_4, 0, __pyx_1);
   __pyx_1 = 0;
-  __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; goto __pyx_L1;}
+  __pyx_2 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_2); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1077 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1077 */
     __pyx_6 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1077; goto __pyx_L1;}
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1077; goto __pyx_L1;}
     Py_INCREF(__pyx_k115p);
     PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k115p);
-    __pyx_3 = PyObject_CallObject(__pyx_6, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1077; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_6, __pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1077; goto __pyx_L1;}
     Py_DECREF(__pyx_6); __pyx_6 = 0;
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -6365,7 +6376,7 @@
   }
   __pyx_L5:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1078 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1078 */
   __pyx_4 = __pyx_f_6mtrand_discnmN_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_hypergeometric,__pyx_v_size,__pyx_v_ongood,__pyx_v_onbad,__pyx_v_onsample); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1078; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -6419,14 +6430,14 @@
   Py_INCREF(__pyx_v_size);
   __pyx_v_op = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1087 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1087 */
   __pyx_1 = PyArray_FROM_OTF(__pyx_v_p,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1087; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)__pyx_v_op));
   __pyx_v_op = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1088 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1088 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -6439,25 +6450,25 @@
   PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_op));
   PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1);
   __pyx_1 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
   __pyx_1 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1089 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1089 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1089; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1089; goto __pyx_L1;}
     Py_INCREF(__pyx_k116p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k116p);
-    __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1089; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1089; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -6467,7 +6478,7 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1090 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1090 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -6480,25 +6491,25 @@
   PyTuple_SET_ITEM(__pyx_2, 0, ((PyObject *)__pyx_v_op));
   PyTuple_SET_ITEM(__pyx_2, 1, __pyx_4);
   __pyx_4 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; goto __pyx_L1;}
+  __pyx_4 = PyObject_Call(__pyx_3, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4);
   __pyx_4 = 0;
-  __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; goto __pyx_L1;}
+  __pyx_2 = PyObject_Call(__pyx_1, __pyx_3, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyObject_IsTrue(__pyx_2); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1091 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1091 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1091; goto __pyx_L1;}
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1091; goto __pyx_L1;}
     Py_INCREF(__pyx_k117p);
     PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k117p);
-    __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1091; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_4, __pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1091; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -6508,7 +6519,7 @@
   }
   __pyx_L3:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1092 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1092 */
   __pyx_2 = __pyx_f_6mtrand_discd_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_logseries,__pyx_v_size,__pyx_v_op); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1092; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -6572,6 +6583,7 @@
   PyObject *__pyx_3 = 0;
   int __pyx_4;
   PyObject *__pyx_5 = 0;
+  Py_ssize_t __pyx_6;
   static char *__pyx_argnames[] = {"mean","cov","size",0};
   __pyx_v_size = __pyx_k58;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "OO|O", __pyx_argnames, &__pyx_v_mean, &__pyx_v_cov, &__pyx_v_size)) return 0;
@@ -6587,39 +6599,39 @@
   __pyx_v_s = Py_None; Py_INCREF(Py_None);
   __pyx_v_v = Py_None; Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1113 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1113 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1113; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_array); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1113; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1113; goto __pyx_L1;}
   Py_INCREF(__pyx_v_mean);
   PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_mean);
-  __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1113; goto __pyx_L1;}
+  __pyx_3 = PyObject_Call(__pyx_2, __pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1113; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_v_mean);
   __pyx_v_mean = __pyx_3;
   __pyx_3 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1114 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1114 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1114; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(__pyx_2, __pyx_n_array); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1114; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1114; goto __pyx_L1;}
   Py_INCREF(__pyx_v_cov);
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_cov);
-  __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1114; goto __pyx_L1;}
+  __pyx_2 = PyObject_Call(__pyx_1, __pyx_3, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1114; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_v_cov);
   __pyx_v_cov = __pyx_2;
   __pyx_2 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1115 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1115 */
   __pyx_4 = __pyx_v_size == Py_None;
   if (__pyx_4) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1116 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1116 */
     __pyx_1 = PyList_New(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1116; goto __pyx_L1;}
     Py_DECREF(__pyx_v_shape);
     __pyx_v_shape = __pyx_1;
@@ -6628,20 +6640,20 @@
   }
   /*else*/ {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1118 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1118 */
     Py_INCREF(__pyx_v_size);
     Py_DECREF(__pyx_v_shape);
     __pyx_v_shape = __pyx_v_size;
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1119 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1119 */
   __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1119; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1119; goto __pyx_L1;}
   __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1119; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_1, 0, __pyx_2);
   __pyx_2 = 0;
-  __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1119; goto __pyx_L1;}
+  __pyx_2 = PyObject_Call(__pyx_3, __pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1119; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   __pyx_3 = PyInt_FromLong(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1119; goto __pyx_L1;}
@@ -6651,12 +6663,12 @@
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   if (__pyx_4) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1120 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1120 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1120; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1120; goto __pyx_L1;}
     Py_INCREF(__pyx_k118p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k118p);
-    __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1120; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1120; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
@@ -6666,13 +6678,13 @@
   }
   __pyx_L3:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1121 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1121 */
   __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1121; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_v_cov, __pyx_n_shape); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1121; goto __pyx_L1;}
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1121; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2);
   __pyx_2 = 0;
-  __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1121; goto __pyx_L1;}
+  __pyx_2 = PyObject_Call(__pyx_1, __pyx_3, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1121; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_1 = PyInt_FromLong(2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1121; goto __pyx_L1;}
@@ -6698,12 +6710,12 @@
   }
   if (__pyx_4) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1122 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1122 */
     __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1122; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1122; goto __pyx_L1;}
     Py_INCREF(__pyx_k119p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k119p);
-    __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1122; goto __pyx_L1;}
+    __pyx_1 = PyObject_Call(__pyx_3, __pyx_2, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1122; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_1, 0, 0);
@@ -6713,7 +6725,7 @@
   }
   __pyx_L4:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1123 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1123 */
   __pyx_5 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1123; goto __pyx_L1;}
   __pyx_3 = PyInt_FromLong(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1123; goto __pyx_L1;}
   __pyx_2 = PyObject_GetItem(__pyx_5, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1123; goto __pyx_L1;}
@@ -6730,12 +6742,12 @@
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   if (__pyx_4) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1124 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1124 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1124; goto __pyx_L1;}
     __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1124; goto __pyx_L1;}
     Py_INCREF(__pyx_k120p);
     PyTuple_SET_ITEM(__pyx_5, 0, __pyx_k120p);
-    __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1124; goto __pyx_L1;}
+    __pyx_2 = PyObject_Call(__pyx_1, __pyx_5, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1124; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_5); __pyx_5 = 0;
     __Pyx_Raise(__pyx_2, 0, 0);
@@ -6745,7 +6757,7 @@
   }
   __pyx_L5:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1126 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1126 */
   __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_isinstance); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1126; goto __pyx_L1;}
   __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1126; goto __pyx_L1;}
   __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1126; goto __pyx_L1;}
@@ -6753,14 +6765,14 @@
   PyTuple_SET_ITEM(__pyx_5, 0, __pyx_v_shape);
   PyTuple_SET_ITEM(__pyx_5, 1, __pyx_1);
   __pyx_1 = 0;
-  __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1126; goto __pyx_L1;}
+  __pyx_2 = PyObject_Call(__pyx_3, __pyx_5, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1126; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   __pyx_4 = PyObject_IsTrue(__pyx_2); if (__pyx_4 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1126; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_4) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1127 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1127 */
     __pyx_1 = PyList_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1127; goto __pyx_L1;}
     Py_INCREF(__pyx_v_shape);
     PyList_SET_ITEM(__pyx_1, 0, __pyx_v_shape);
@@ -6771,20 +6783,20 @@
   }
   __pyx_L6:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1128 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1128 */
   __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_list); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1128; goto __pyx_L1;}
-  __pyx_5 = PySequence_GetSlice(__pyx_v_shape, 0, 0x7fffffff); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1128; goto __pyx_L1;}
+  __pyx_5 = PySequence_GetSlice(__pyx_v_shape, 0, PY_SSIZE_T_MAX); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1128; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1128; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_2, 0, __pyx_5);
   __pyx_5 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1128; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_3, __pyx_2, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1128; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_v_final_shape);
   __pyx_v_final_shape = __pyx_1;
   __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1129 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1129 */
   __pyx_5 = PyObject_GetAttr(__pyx_v_final_shape, __pyx_n_append); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1129; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1129; goto __pyx_L1;}
   __pyx_2 = PyInt_FromLong(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1129; goto __pyx_L1;}
@@ -6794,12 +6806,12 @@
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1129; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
   __pyx_1 = 0;
-  __pyx_2 = PyObject_CallObject(__pyx_5, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1129; goto __pyx_L1;}
+  __pyx_2 = PyObject_Call(__pyx_5, __pyx_3, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1129; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1133 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1133 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_standard_normal); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1133; goto __pyx_L1;}
   __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1133; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_5, __pyx_n_multiply); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1133; goto __pyx_L1;}
@@ -6809,20 +6821,20 @@
   __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1133; goto __pyx_L1;}
   Py_INCREF(__pyx_v_final_shape);
   PyTuple_SET_ITEM(__pyx_5, 0, __pyx_v_final_shape);
-  __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1133; goto __pyx_L1;}
+  __pyx_3 = PyObject_Call(__pyx_2, __pyx_5, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1133; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1133; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_2, 0, __pyx_3);
   __pyx_3 = 0;
-  __pyx_5 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1133; goto __pyx_L1;}
+  __pyx_5 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1133; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_v_x);
   __pyx_v_x = __pyx_5;
   __pyx_5 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1134 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1134 */
   __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(__pyx_3, __pyx_n_multiply); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
@@ -6832,20 +6844,20 @@
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;}
   Py_INCREF(__pyx_v_final_shape);
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_final_shape);
-  __pyx_1 = PyObject_CallObject(__pyx_5, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_5, __pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_5 = PyInt_FromLong(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;}
   __pyx_3 = PyNumber_Subtract(__pyx_1, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_5); __pyx_5 = 0;
-  __pyx_4 = PyInt_AsLong(__pyx_3); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;}
+  __pyx_6 = PyInt_AsSsize_t(__pyx_3); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_1 = PySequence_GetSlice(__pyx_v_final_shape, 0, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;}
+  __pyx_1 = PySequence_GetSlice(__pyx_v_final_shape, 0, __pyx_6); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;}
   __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_5, 0, __pyx_1);
   __pyx_1 = 0;
-  __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;}
+  __pyx_3 = PyObject_Call(__pyx_2, __pyx_5, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   __pyx_1 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1135; goto __pyx_L1;}
@@ -6861,7 +6873,7 @@
   if (PyObject_SetAttr(__pyx_v_x, __pyx_n_shape, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1143 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1143 */
   __pyx_2 = PyList_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1143; goto __pyx_L1;}
   Py_INCREF(__pyx_n_svd);
   PyList_SET_ITEM(__pyx_2, 0, __pyx_n_svd);
@@ -6873,11 +6885,11 @@
   __pyx_5 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1145 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1145 */
   __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1145; goto __pyx_L1;}
   Py_INCREF(__pyx_v_cov);
   PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_cov);
-  __pyx_2 = PyObject_CallObject(__pyx_v_svd, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1145; goto __pyx_L1;}
+  __pyx_2 = PyObject_Call(__pyx_v_svd, __pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1145; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   __pyx_3 = __Pyx_UnpackItem(__pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1145; goto __pyx_L1;}
   Py_DECREF(__pyx_v_u);
@@ -6894,7 +6906,7 @@
   if (__Pyx_EndUnpack(__pyx_2, 3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1145; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1146 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1146 */
   __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1146; goto __pyx_L1;}
   __pyx_5 = PyObject_GetAttr(__pyx_3, __pyx_n_dot); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1146; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
@@ -6904,7 +6916,7 @@
   __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1146; goto __pyx_L1;}
   Py_INCREF(__pyx_v_s);
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_s);
-  __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1146; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1146; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_2 = PyNumber_Multiply(__pyx_v_x, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1146; goto __pyx_L1;}
@@ -6914,14 +6926,14 @@
   Py_INCREF(__pyx_v_v);
   PyTuple_SET_ITEM(__pyx_3, 1, __pyx_v_v);
   __pyx_2 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_5, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1146; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_5, __pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1146; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_v_x);
   __pyx_v_x = __pyx_1;
   __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1149 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1149 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1149; goto __pyx_L1;}
   __pyx_5 = PyObject_GetAttr(__pyx_2, __pyx_n_add); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1149; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -6932,23 +6944,23 @@
   PyTuple_SET_ITEM(__pyx_3, 1, __pyx_v_x);
   Py_INCREF(__pyx_v_x);
   PyTuple_SET_ITEM(__pyx_3, 2, __pyx_v_x);
-  __pyx_1 = PyObject_CallObject(__pyx_5, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1149; goto __pyx_L1;}
+  __pyx_1 = PyObject_Call(__pyx_5, __pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1149; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1150 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1150 */
   __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_tuple); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1150; goto __pyx_L1;}
   __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1150; goto __pyx_L1;}
   Py_INCREF(__pyx_v_final_shape);
   PyTuple_SET_ITEM(__pyx_5, 0, __pyx_v_final_shape);
-  __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1150; goto __pyx_L1;}
+  __pyx_3 = PyObject_Call(__pyx_2, __pyx_5, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1150; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (PyObject_SetAttr(__pyx_v_x, __pyx_n_shape, __pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1150; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1151 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1151 */
   Py_INCREF(__pyx_v_x);
   __pyx_r = __pyx_v_x;
   goto __pyx_L0;
@@ -7017,38 +7029,38 @@
   __pyx_v_shape = Py_None; Py_INCREF(Py_None);
   __pyx_v_multin = Py_None; Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1169 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1169 */
   __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1169; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1169; goto __pyx_L1;}
   Py_INCREF(__pyx_v_pvals);
   PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_pvals);
-  __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1169; goto __pyx_L1;}
+  __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1169; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_4 = PyInt_AsLong(__pyx_3); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1169; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   __pyx_v_d = __pyx_4;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1170 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1170 */
   __pyx_1 = PyArray_ContiguousFromObject(__pyx_v_pvals,NPY_DOUBLE,1,1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1170; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
   Py_DECREF(((PyObject *)arrayObject_parr));
   arrayObject_parr = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1171 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1171 */
   __pyx_v_pix = ((double (*))arrayObject_parr->data);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1173 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1173 */
   __pyx_5 = (__pyx_f_6mtrand_kahan_sum(__pyx_v_pix,(__pyx_v_d - 1)) > 1.0);
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1174 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1174 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1174; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1174; goto __pyx_L1;}
     Py_INCREF(__pyx_k123p);
     PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k123p);
-    __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1174; goto __pyx_L1;}
+    __pyx_1 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1174; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     __Pyx_Raise(__pyx_1, 0, 0);
@@ -7058,11 +7070,11 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1176 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1176 */
   __pyx_5 = __pyx_v_size == Py_None;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1177 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1177 */
     __pyx_2 = PyInt_FromLong(__pyx_v_d); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1177; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1177; goto __pyx_L1;}
     PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2);
@@ -7076,7 +7088,7 @@
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1178; goto __pyx_L1;}
   Py_INCREF(__pyx_v_size);
   PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_size);
-  __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1178; goto __pyx_L1;}
+  __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1178; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1178; goto __pyx_L1;}
@@ -7085,7 +7097,7 @@
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1179 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1179 */
     __pyx_2 = PyInt_FromLong(__pyx_v_d); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1179; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1179; goto __pyx_L1;}
     Py_INCREF(__pyx_v_size);
@@ -7099,7 +7111,7 @@
   }
   /*else*/ {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1181 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1181 */
     __pyx_1 = PyInt_FromLong(__pyx_v_d); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1181; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1181; goto __pyx_L1;}
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_1);
@@ -7112,7 +7124,7 @@
   }
   __pyx_L3:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1183 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1183 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1183; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_zeros); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1183; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -7122,78 +7134,78 @@
   PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_shape);
   PyTuple_SET_ITEM(__pyx_1, 1, __pyx_3);
   __pyx_3 = 0;
-  __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1183; goto __pyx_L1;}
+  __pyx_3 = PyObject_Call(__pyx_2, __pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1183; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_v_multin);
   __pyx_v_multin = __pyx_3;
   __pyx_3 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1184 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1184 */
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_v_multin)));
   Py_DECREF(((PyObject *)arrayObject_mnarr));
   arrayObject_mnarr = ((PyArrayObject *)__pyx_v_multin);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1185 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1185 */
   __pyx_v_mnix = ((long (*))arrayObject_mnarr->data);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1186 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1186 */
   __pyx_v_i = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1187 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1187 */
   while (1) {
     __pyx_L4:;
     __pyx_5 = (__pyx_v_i < PyArray_SIZE(arrayObject_mnarr));
     if (!__pyx_5) break;
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1188 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1188 */
     __pyx_v_Sum = 1.0;
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1189 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1189 */
     __pyx_v_dn = __pyx_v_n;
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1190 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1190 */
     __pyx_4 = (__pyx_v_d - 1);
     for (__pyx_v_j = 0; __pyx_v_j < __pyx_4; ++__pyx_v_j) {
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1191 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1191 */
       (__pyx_v_mnix[(__pyx_v_i + __pyx_v_j)]) = rk_binomial(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,__pyx_v_dn,((__pyx_v_pix[__pyx_v_j]) / __pyx_v_Sum));
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1192 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1192 */
       __pyx_v_dn = (__pyx_v_dn - (__pyx_v_mnix[(__pyx_v_i + __pyx_v_j)]));
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1193 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1193 */
       __pyx_5 = (__pyx_v_dn <= 0);
       if (__pyx_5) {
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1194 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1194 */
         goto __pyx_L7;
         goto __pyx_L8;
       }
       __pyx_L8:;
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1195 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1195 */
       __pyx_v_Sum = (__pyx_v_Sum - (__pyx_v_pix[__pyx_v_j]));
       __pyx_L6:;
     }
     __pyx_L7:;
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1196 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1196 */
     __pyx_5 = (__pyx_v_dn > 0);
     if (__pyx_5) {
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1197 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1197 */
       (__pyx_v_mnix[((__pyx_v_i + __pyx_v_d) - 1)]) = __pyx_v_dn;
       goto __pyx_L9;
     }
     __pyx_L9:;
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1199 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1199 */
     __pyx_v_i = (__pyx_v_i + __pyx_v_d);
   }
   __pyx_L5:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1201 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1201 */
   Py_INCREF(__pyx_v_multin);
   __pyx_r = __pyx_v_multin;
   goto __pyx_L0;
@@ -7240,12 +7252,12 @@
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_x);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1212 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1212 */
   __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1212; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1212; goto __pyx_L1;}
   Py_INCREF(__pyx_v_x);
   PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_x);
-  __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1212; goto __pyx_L1;}
+  __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1212; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_1 = PyInt_FromLong(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1212; goto __pyx_L1;}
@@ -7256,10 +7268,10 @@
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_v_i = __pyx_4;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1213 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1213 */
   /*try:*/ {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1214 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1214 */
     __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1214; goto __pyx_L2;}
     __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1214; goto __pyx_L2;}
     __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1214; goto __pyx_L2;}
@@ -7267,7 +7279,7 @@
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1214; goto __pyx_L2;}
     PyTuple_SET_ITEM(__pyx_1, 0, __pyx_2);
     __pyx_2 = 0;
-    __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1214; goto __pyx_L2;}
+    __pyx_2 = PyObject_Call(__pyx_3, __pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1214; goto __pyx_L2;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     __pyx_4 = PyInt_AsLong(__pyx_2); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1214; goto __pyx_L2;}
@@ -7280,32 +7292,32 @@
   Py_XDECREF(__pyx_1); __pyx_1 = 0;
   Py_XDECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1215 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1215 */
   /*except:*/ {
     __Pyx_AddTraceback("mtrand.shuffle");
     __pyx_3 = __Pyx_GetExcValue(); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1215; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1216 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1216 */
     __pyx_v_j = 0;
     goto __pyx_L3;
   }
   __pyx_L3:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1218 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1218 */
   __pyx_5 = (__pyx_v_j == 0);
   if (__pyx_5) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1220 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1220 */
     while (1) {
       __pyx_L5:;
       __pyx_5 = (__pyx_v_i > 0);
       if (!__pyx_5) break;
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1221 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1221 */
       __pyx_v_j = rk_interval(__pyx_v_i,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1222 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1222 */
       __pyx_1 = PyInt_FromLong(__pyx_v_j); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1222; goto __pyx_L1;}
       __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1222; goto __pyx_L1;}
       Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -7321,7 +7333,7 @@
       Py_DECREF(__pyx_3); __pyx_3 = 0;
       Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1223 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1223 */
       __pyx_v_i = (__pyx_v_i - 1);
     }
     __pyx_L6:;
@@ -7329,7 +7341,7 @@
   }
   /*else*/ {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1226 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1226 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_hasattr); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1226; goto __pyx_L1;}
     __pyx_3 = PyInt_FromLong(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1226; goto __pyx_L1;}
     __pyx_1 = PyObject_GetItem(__pyx_v_x, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1226; goto __pyx_L1;}
@@ -7339,34 +7351,34 @@
     Py_INCREF(__pyx_n_copy);
     PyTuple_SET_ITEM(__pyx_3, 1, __pyx_n_copy);
     __pyx_1 = 0;
-    __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1226; goto __pyx_L1;}
+    __pyx_1 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1226; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     __pyx_5 = PyInt_AsLong(__pyx_1); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1226; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     __pyx_v_copy = __pyx_5;
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1227 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1227 */
     __pyx_5 = __pyx_v_copy;
     if (__pyx_5) {
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1228 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1228 */
       while (1) {
         __pyx_L8:;
         __pyx_5 = (__pyx_v_i > 0);
         if (!__pyx_5) break;
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1229 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1229 */
         __pyx_v_j = rk_interval(__pyx_v_i,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1230 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1230 */
         __pyx_2 = PyInt_FromLong(__pyx_v_j); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;}
         __pyx_3 = PyObject_GetItem(__pyx_v_x, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;}
         Py_DECREF(__pyx_2); __pyx_2 = 0;
         __pyx_1 = PyObject_GetAttr(__pyx_3, __pyx_n_copy); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;}
         Py_DECREF(__pyx_3); __pyx_3 = 0;
         __pyx_2 = PyTuple_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;}
-        __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;}
+        __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;}
         Py_DECREF(__pyx_1); __pyx_1 = 0;
         Py_DECREF(__pyx_2); __pyx_2 = 0;
         __pyx_1 = PyInt_FromLong(__pyx_v_i); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;}
@@ -7375,7 +7387,7 @@
         __pyx_1 = PyObject_GetAttr(__pyx_2, __pyx_n_copy); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;}
         Py_DECREF(__pyx_2); __pyx_2 = 0;
         __pyx_2 = PyTuple_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;}
-        __pyx_6 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;}
+        __pyx_6 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;}
         Py_DECREF(__pyx_1); __pyx_1 = 0;
         Py_DECREF(__pyx_2); __pyx_2 = 0;
         __pyx_1 = PyInt_FromLong(__pyx_v_i); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;}
@@ -7387,7 +7399,7 @@
         Py_DECREF(__pyx_2); __pyx_2 = 0;
         Py_DECREF(__pyx_6); __pyx_6 = 0;
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1231 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1231 */
         __pyx_v_i = (__pyx_v_i - 1);
       }
       __pyx_L9:;
@@ -7395,25 +7407,25 @@
     }
     /*else*/ {
 
-      /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1233 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1233 */
       while (1) {
         __pyx_L10:;
         __pyx_5 = (__pyx_v_i > 0);
         if (!__pyx_5) break;
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1234 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1234 */
         __pyx_v_j = rk_interval(__pyx_v_i,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1235 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1235 */
         __pyx_1 = PyInt_FromLong(__pyx_v_j); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;}
         __pyx_3 = PyObject_GetItem(__pyx_v_x, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;}
         Py_DECREF(__pyx_1); __pyx_1 = 0;
-        __pyx_2 = PySequence_GetSlice(__pyx_3, 0, 0x7fffffff); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;}
+        __pyx_2 = PySequence_GetSlice(__pyx_3, 0, PY_SSIZE_T_MAX); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;}
         Py_DECREF(__pyx_3); __pyx_3 = 0;
         __pyx_6 = PyInt_FromLong(__pyx_v_i); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;}
         __pyx_1 = PyObject_GetItem(__pyx_v_x, __pyx_6); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;}
         Py_DECREF(__pyx_6); __pyx_6 = 0;
-        __pyx_3 = PySequence_GetSlice(__pyx_1, 0, 0x7fffffff); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;}
+        __pyx_3 = PySequence_GetSlice(__pyx_1, 0, PY_SSIZE_T_MAX); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;}
         Py_DECREF(__pyx_1); __pyx_1 = 0;
         __pyx_6 = PyInt_FromLong(__pyx_v_i); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;}
         if (PyObject_SetItem(__pyx_v_x, __pyx_6, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;}
@@ -7424,7 +7436,7 @@
         Py_DECREF(__pyx_1); __pyx_1 = 0;
         Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-        /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1236 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1236 */
         __pyx_v_i = (__pyx_v_i - 1);
       }
       __pyx_L11:;
@@ -7466,12 +7478,12 @@
   Py_INCREF(__pyx_v_x);
   __pyx_v_arr = Py_None; Py_INCREF(Py_None);
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1244 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1244 */
   __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_type); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1244; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1244; goto __pyx_L1;}
   Py_INCREF(__pyx_v_x);
   PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_x);
-  __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1244; goto __pyx_L1;}
+  __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1244; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1244; goto __pyx_L1;}
@@ -7480,14 +7492,14 @@
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_4) {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1245 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1245 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1245; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_arange); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1245; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1245; goto __pyx_L1;}
     Py_INCREF(__pyx_v_x);
     PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_x);
-    __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1245; goto __pyx_L1;}
+    __pyx_2 = PyObject_Call(__pyx_3, __pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1245; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_v_arr);
@@ -7497,14 +7509,14 @@
   }
   /*else*/ {
 
-    /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1247 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1247 */
     __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1247; goto __pyx_L1;}
     __pyx_1 = PyObject_GetAttr(__pyx_3, __pyx_n_array); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1247; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1247; goto __pyx_L1;}
     Py_INCREF(__pyx_v_x);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_x);
-    __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1247; goto __pyx_L1;}
+    __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1247; goto __pyx_L1;}
     Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     Py_DECREF(__pyx_v_arr);
@@ -7513,17 +7525,17 @@
   }
   __pyx_L2:;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1248 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1248 */
   __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_shuffle); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1248; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1248; goto __pyx_L1;}
   Py_INCREF(__pyx_v_arr);
   PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_arr);
-  __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1248; goto __pyx_L1;}
+  __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1248; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1249 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1249 */
   Py_INCREF(__pyx_v_arr);
   __pyx_r = __pyx_v_arr;
   goto __pyx_L0;
@@ -7933,37 +7945,37 @@
   if (PyObject_SetAttrString(__pyx_m, "RandomState", (PyObject *)&__pyx_type_6mtrand_RandomState) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 456; goto __pyx_L1;}
   __pyx_ptype_6mtrand_RandomState = &__pyx_type_6mtrand_RandomState;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":119 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":119 */
   import_array();
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":121 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":121 */
   __pyx_1 = __Pyx_Import(__pyx_n_numpy, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; goto __pyx_L1;}
   if (PyObject_SetAttr(__pyx_m, __pyx_n__sp, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":476 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":476 */
   Py_INCREF(Py_None);
   __pyx_k2 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":486 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":486 */
   Py_INCREF(Py_None);
   __pyx_k3 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":547 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":547 */
   Py_INCREF(Py_None);
   __pyx_k4 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":554 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":554 */
   Py_INCREF(Py_None);
   __pyx_k5 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":561 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":561 */
   Py_INCREF(Py_None);
   __pyx_k6 = Py_None;
   Py_INCREF(Py_None);
   __pyx_k7 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":607 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":607 */
   __pyx_1 = PyFloat_FromDouble(0.0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 607; goto __pyx_L1;}
   __pyx_k8 = __pyx_1;
   __pyx_1 = 0;
@@ -7973,17 +7985,17 @@
   Py_INCREF(Py_None);
   __pyx_k10 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":655 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":655 */
   Py_INCREF(Py_None);
   __pyx_k11 = Py_None;
   Py_INCREF(Py_None);
   __pyx_k12 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":668 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":668 */
   Py_INCREF(Py_None);
   __pyx_k13 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":675 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":675 */
   __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 675; goto __pyx_L1;}
   __pyx_k14 = __pyx_3;
   __pyx_3 = 0;
@@ -7993,73 +8005,73 @@
   Py_INCREF(Py_None);
   __pyx_k16 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":688 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":688 */
   Py_INCREF(Py_None);
   __pyx_k17 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":704 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":704 */
   __pyx_5 = PyFloat_FromDouble(1.0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 704; goto __pyx_L1;}
   __pyx_k18 = __pyx_5;
   __pyx_5 = 0;
   Py_INCREF(Py_None);
   __pyx_k19 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":715 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":715 */
   Py_INCREF(Py_None);
   __pyx_k20 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":722 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":722 */
   Py_INCREF(Py_None);
   __pyx_k21 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":733 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":733 */
   __pyx_6 = PyFloat_FromDouble(1.0); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 733; goto __pyx_L1;}
   __pyx_k22 = __pyx_6;
   __pyx_6 = 0;
   Py_INCREF(Py_None);
   __pyx_k23 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":748 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":748 */
   Py_INCREF(Py_None);
   __pyx_k24 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":763 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":763 */
   Py_INCREF(Py_None);
   __pyx_k25 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":784 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":784 */
   Py_INCREF(Py_None);
   __pyx_k26 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":795 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":795 */
   Py_INCREF(Py_None);
   __pyx_k27 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":811 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":811 */
   Py_INCREF(Py_None);
   __pyx_k28 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":818 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":818 */
   Py_INCREF(Py_None);
   __pyx_k29 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":829 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":829 */
   Py_INCREF(Py_None);
   __pyx_k30 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":843 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":843 */
   Py_INCREF(Py_None);
   __pyx_k31 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":854 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":854 */
   Py_INCREF(Py_None);
   __pyx_k32 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":865 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":865 */
   Py_INCREF(Py_None);
   __pyx_k33 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":876 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":876 */
   __pyx_7 = PyFloat_FromDouble(0.0); if (!__pyx_7) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 876; goto __pyx_L1;}
   __pyx_k34 = __pyx_7;
   __pyx_7 = 0;
@@ -8069,7 +8081,7 @@
   Py_INCREF(Py_None);
   __pyx_k36 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":889 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":889 */
   __pyx_9 = PyFloat_FromDouble(0.0); if (!__pyx_9) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 889; goto __pyx_L1;}
   __pyx_k37 = __pyx_9;
   __pyx_9 = 0;
@@ -8079,7 +8091,7 @@
   Py_INCREF(Py_None);
   __pyx_k39 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":902 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":902 */
   __pyx_11 = PyFloat_FromDouble(0.0); if (!__pyx_11) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 902; goto __pyx_L1;}
   __pyx_k40 = __pyx_11;
   __pyx_11 = 0;
@@ -8089,7 +8101,7 @@
   Py_INCREF(Py_None);
   __pyx_k42 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":915 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":915 */
   __pyx_13 = PyFloat_FromDouble(0.0); if (!__pyx_13) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 915; goto __pyx_L1;}
   __pyx_k43 = __pyx_13;
   __pyx_13 = 0;
@@ -8099,376 +8111,376 @@
   Py_INCREF(Py_None);
   __pyx_k45 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":933 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":933 */
   __pyx_15 = PyFloat_FromDouble(1.0); if (!__pyx_15) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 933; goto __pyx_L1;}
   __pyx_k46 = __pyx_15;
   __pyx_15 = 0;
   Py_INCREF(Py_None);
   __pyx_k47 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":944 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":944 */
   Py_INCREF(Py_None);
   __pyx_k48 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":959 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":959 */
   Py_INCREF(Py_None);
   __pyx_k49 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":982 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":982 */
   Py_INCREF(Py_None);
   __pyx_k50 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":999 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":999 */
   Py_INCREF(Py_None);
   __pyx_k51 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1017 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1017 */
   __pyx_16 = PyFloat_FromDouble(1.0); if (!__pyx_16) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1017; goto __pyx_L1;}
   __pyx_k52 = __pyx_16;
   __pyx_16 = 0;
   Py_INCREF(Py_None);
   __pyx_k53 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1028 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1028 */
   Py_INCREF(Py_None);
   __pyx_k54 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1039 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1039 */
   Py_INCREF(Py_None);
   __pyx_k55 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1053 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1053 */
   Py_INCREF(Py_None);
   __pyx_k56 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1081 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1081 */
   Py_INCREF(Py_None);
   __pyx_k57 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1095 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1095 */
   Py_INCREF(Py_None);
   __pyx_k58 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1153 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1153 */
   Py_INCREF(Py_None);
   __pyx_k59 = Py_None;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1251 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1251 */
   __pyx_17 = PyTuple_New(0); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1251; goto __pyx_L1;}
-  __pyx_18 = PyObject_CallObject(((PyObject*)__pyx_ptype_6mtrand_RandomState), __pyx_17); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1251; goto __pyx_L1;}
+  __pyx_18 = PyObject_Call(((PyObject*)__pyx_ptype_6mtrand_RandomState), __pyx_17, 0); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1251; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n__rand, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1251; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1252 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1252 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1252; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_seed); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1252; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_seed, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1252; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1253 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1253 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1253; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_get_state); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1253; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_get_state, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1253; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1254 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1254 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1254; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_set_state); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1254; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_set_state, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1254; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1255 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1255 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1255; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_random_sample); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1255; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_random_sample, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1255; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1256 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1256 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1256; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_randint); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1256; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_randint, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1256; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1257 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1257 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1257; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_bytes); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1257; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_bytes, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1257; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1258 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1258 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1258; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_uniform); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1258; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_uniform, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1258; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1259 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1259 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1259; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_rand); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1259; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_rand, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1259; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1260 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1260 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1260; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_randn); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1260; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_randn, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1260; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1261 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1261 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1261; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_random_integers); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1261; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_random_integers, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1261; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1262 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1262 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1262; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_normal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1262; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_normal, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1262; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1263 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1263 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1263; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_normal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1263; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_normal, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1263; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1264 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1264 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1264; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_beta); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1264; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_beta, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1264; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1265 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1265 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1265; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_exponential); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1265; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_exponential, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1265; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1266 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1266 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1266; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_exponential); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1266; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_exponential, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1266; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1267 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1267 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1267; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_gamma); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1267; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_gamma, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1267; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1268 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1268 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1268; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_gamma); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1268; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_gamma, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1268; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1269 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1269 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1269; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_f); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1269; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_f, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1269; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1270 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1270 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1270; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_noncentral_f); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1270; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_noncentral_f, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1270; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1271 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1271 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1271; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_chisquare); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1271; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_chisquare, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1271; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1272 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1272 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1272; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_noncentral_chisquare); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1272; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_noncentral_chisquare, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1272; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1273 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1273 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1273; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_cauchy); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1273; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_cauchy, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1273; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1274 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1274 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1274; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_t); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1274; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_t, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1274; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1275 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1275 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1275; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_vonmises); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1275; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_vonmises, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1275; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1276 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1276 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1276; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_pareto); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1276; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_pareto, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1276; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1277 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1277 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1277; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_weibull); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1277; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_weibull, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1277; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1278 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1278 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1278; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_power); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1278; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_power, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1278; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1279 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1279 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1279; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_laplace); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1279; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_laplace, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1279; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1280 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1280 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1280; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_gumbel); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1280; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_gumbel, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1280; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1281 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1281 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1281; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_logistic); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1281; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_logistic, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1281; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1282 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1282 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1282; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_lognormal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1282; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_lognormal, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1282; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1283 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1283 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1283; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_rayleigh); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1283; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_rayleigh, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1283; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1284 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1284 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1284; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_wald); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1284; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_wald, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1284; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1285 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1285 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1285; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_triangular); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1285; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_triangular, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1285; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1287 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1287 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1287; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_binomial); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1287; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_binomial, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1287; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1288 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1288 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1288; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_negative_binomial); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1288; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_negative_binomial, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1288; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1289 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1289 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1289; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_poisson); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1289; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_poisson, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1289; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1290 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1290 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1290; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_zipf); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1290; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_zipf, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1290; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1291 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1291 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1291; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_geometric); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1291; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_geometric, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1291; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1292 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1292 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1292; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_hypergeometric); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1292; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_hypergeometric, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1292; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1293 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1293 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1293; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_logseries); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1293; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_logseries, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1293; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1295 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1295 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1295; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_multivariate_normal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1295; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_multivariate_normal, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1295; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1296 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1296 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1296; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_multinomial); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1296; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_multinomial, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1296; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1298 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1298 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1298; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_shuffle); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1298; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_shuffle, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1298; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/Users/oliphant/code/numpy/numpy/random/mtrand/mtrand.pyx":1299 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1299 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1299; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_permutation); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1299; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
@@ -8512,7 +8524,7 @@
     PyObject **args, 
     PyObject **kwds,
     char *kwd_list[], 
-    int nargs,
+    Py_ssize_t nargs,
     PyObject **args2, 
     PyObject **kwds2)
 {
@@ -8572,10 +8584,8 @@
 bad:
     Py_XDECREF(args1);
     Py_XDECREF(kwds1);
-    if (*args2)
-        Py_XDECREF(*args2);
-    if (*kwds2)
-        Py_XDECREF(*kwds2);
+    Py_XDECREF(*args2);
+    Py_XDECREF(*kwds2);
     return -1;
 }
 
@@ -8646,10 +8656,16 @@
         Py_INCREF(type);
         Py_DECREF(tmp);
     }
-    if (PyString_Check(type))
-        ;
-    else if (PyClass_Check(type))
-        ; /*PyErr_NormalizeException(&type, &value, &tb);*/
+    if (PyString_CheckExact(type)) {
+        /* Raising builtin string is deprecated but still allowed --
+         * do nothing.  Raising an instance of a new-style str
+         * subclass is right out. */
+        if (PyErr_Warn(PyExc_DeprecationWarning,
+                   "raising a string exception is deprecated"))
+                goto raise_error;
+    }
+    else if (PyType_Check(type) || PyClass_Check(type))
+        ; /* PyErr_NormalizeException(&type, &value, &tb); */
     else if (PyInstance_Check(type)) {
         /* Raising an instance.  The value should be a dummy. */
         if (value != Py_None) {
@@ -8665,12 +8681,29 @@
             Py_INCREF(type);
         }
     }
+    else if (PyType_IsSubtype(type->ob_type, (PyTypeObject*)PyExc_Exception)) {
+        /* Raising a new-style object (in Py2.5).
+           The value should be a dummy. */
+        if (value != Py_None) {
+                PyErr_SetString(PyExc_TypeError,
+                  "instance exception may not have a separate value");
+                goto raise_error;
+        }
+        else {
+                /* Normalize to raise <class>, <instance> */
+                Py_DECREF(value);
+                value = type;
+                type = (PyObject*) type->ob_type;
+                Py_INCREF(type);
+        }
+    }
     else {
         /* Not something you can raise.  You get an exception
            anyway, just not what you specified :-) */
         PyErr_Format(PyExc_TypeError,
-                 "exceptions must be strings, classes, or "
-                 "instances, not %s", type->ob_type->tp_name);
+                     "exceptions must be classes, instances, or "
+                     "strings (deprecated), not %s",
+                     type->ob_type->tp_name);
         goto raise_error;
     }
     PyErr_Restore(type, value, tb);
@@ -8697,7 +8730,7 @@
     PyErr_SetString(PyExc_ValueError, "unpack sequence of wrong size");
 }
 
-static PyObject *__Pyx_UnpackItem(PyObject *seq, int i) {
+static PyObject *__Pyx_UnpackItem(PyObject *seq, Py_ssize_t i) {
   PyObject *item;
   if (!(item = PySequence_GetItem(seq, i))) {
     if (PyErr_ExceptionMatches(PyExc_IndexError))
@@ -8706,7 +8739,7 @@
   return item;
 }
 
-static int __Pyx_EndUnpack(PyObject *seq, int i) {
+static int __Pyx_EndUnpack(PyObject *seq, Py_ssize_t i) {
   PyObject *item;
   if (item = PySequence_GetItem(seq, i)) {
     Py_DECREF(item);

Modified: branches/splitcode/numpy/random/setup.py
===================================================================
--- branches/splitcode/numpy/random/setup.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/random/setup.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 from os.path import join, split
 
 def configuration(parent_package='',top_path=None):
@@ -32,7 +31,7 @@
                         )
 
     config.add_data_files(('.', join('mtrand', 'randomkit.h')))
-    
+
     return config
 
 def testcode_wincrypt():

Modified: branches/splitcode/numpy/testing/info.py
===================================================================
--- branches/splitcode/numpy/testing/info.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/testing/info.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,12 +1,12 @@
 """
-Scipy testing tools
+Numpy testing tools
 ===================
 
-Scipy-style unit-testing
+Numpy-style unit-testing
 ------------------------
 
-  ScipyTest -- Scipy tests site manager
-  ScipyTestCase -- unittest.TestCase with measure method
+  NumpyTest -- Numpy tests site manager
+  NumpyTestCase -- unittest.TestCase with measure method
   IgnoreException -- raise when checking disabled feature, it'll be ignored
   set_package_path -- prepend package build directory to path
   set_local_path -- prepend local directory (to tests files) to path

Modified: branches/splitcode/numpy/testing/numpytest.py
===================================================================
--- branches/splitcode/numpy/testing/numpytest.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/testing/numpytest.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,4 +1,3 @@
-
 import os
 import re
 import sys
@@ -452,8 +451,6 @@
                 continue
             modules.append(module)
 
-        
-
         self.test_files = []
         suites = []
         for module in modules:
@@ -535,7 +532,7 @@
 
             if not sys.modules.has_key(test_dir_module):
                 sys.modules[test_dir_module] = imp.new_module(test_dir_module)
-            
+
             for fn in os.listdir(test_dir):
                 base, ext = os.path.splitext(fn)
                 if ext != '.py':
@@ -581,7 +578,7 @@
         all_tests = unittest.TestSuite(suite_list)
         if level<0:
             return all_tests
-       
+
         runner = unittest.TextTestRunner(verbosity=verbosity)
         # Use the builtin displayhook. If the tests are being run
         # under IPython (for instance), any doctest test suites will
@@ -628,7 +625,7 @@
         sys.stdout.flush()
 
 ScipyTest = NumpyTest
-        
+
 def importall(package):
     """
     Try recursively to import all subpackages under package.

Modified: branches/splitcode/numpy/tests/test_ctypeslib.py
===================================================================
--- branches/splitcode/numpy/tests/test_ctypeslib.py	2007-01-09 08:00:26 UTC (rev 3508)
+++ branches/splitcode/numpy/tests/test_ctypeslib.py	2007-01-09 18:24:53 UTC (rev 3509)
@@ -1,63 +1,63 @@
-from numpy.testing import * 
-set_package_path() 
-import numpy as N 
+from numpy.testing import *
+set_package_path()
+import numpy as N
 from numpy.ctypeslib import ndpointer
-restore_path() 
- 
-class test_ndpointer(NumpyTestCase): 
-    def check_dtype(self): 
-        dt = N.intc 
-        p = ndpointer(dtype=dt) 
-        self.assert_(p.from_param(N.array([1], dt))) 
-        dt = '<i4' 
-        p = ndpointer(dtype=dt) 
-        self.assert_(p.from_param(N.array([1], dt))) 
-        dt = N.dtype('>i4') 
-        p = ndpointer(dtype=dt) 
-        p.from_param(N.array([1], dt)) 
-        self.assertRaises(TypeError, p.from_param, 
-                          N.array([1], dt.newbyteorder('swap'))) 
-        dtnames = ['x', 'y'] 
-        dtformats = [N.intc, N.float64] 
-        dtdescr = {'names' : dtnames, 'formats' : dtformats} 
-        dt = N.dtype(dtdescr) 
-        p = ndpointer(dtype=dt) 
-        self.assert_(p.from_param(N.zeros((10,), dt))) 
-        samedt = N.dtype(dtdescr) 
-        p = ndpointer(dtype=samedt) 
-        self.assert_(p.from_param(N.zeros((10,), dt))) 
+restore_path()
+
+class test_ndpointer(NumpyTestCase):
+    def check_dtype(self):
+        dt = N.intc
+        p = ndpointer(dtype=dt)
+        self.assert_(p.from_param(N.array([1], dt)))
+        dt = '<i4'
+        p = ndpointer(dtype=dt)
+        self.assert_(p.from_param(N.array([1], dt)))
+        dt = N.dtype('>i4')
+        p = ndpointer(dtype=dt)
+        p.from_param(N.array([1], dt))
+        self.assertRaises(TypeError, p.from_param,
+                          N.array([1], dt.newbyteorder('swap')))
+        dtnames = ['x', 'y']
+        dtformats = [N.intc, N.float64]
+        dtdescr = {'names' : dtnames, 'formats' : dtformats}
+        dt = N.dtype(dtdescr)
+        p = ndpointer(dtype=dt)
+        self.assert_(p.from_param(N.zeros((10,), dt)))
+        samedt = N.dtype(dtdescr)
+        p = ndpointer(dtype=samedt)
+        self.assert_(p.from_param(N.zeros((10,), dt)))
         dt2 = N.dtype(dtdescr, align=True)
         if dt.itemsize != dt2.itemsize:
             self.assertRaises(TypeError, p.from_param, N.zeros((10,), dt2))
         else:
             self.assert_(p.from_param(N.zeros((10,), dt2)))
- 
-    def check_ndim(self): 
-        p = ndpointer(ndim=0) 
-        self.assert_(p.from_param(N.array(1))) 
-        self.assertRaises(TypeError, p.from_param, N.array([1])) 
-        p = ndpointer(ndim=1) 
-        self.assertRaises(TypeError, p.from_param, N.array(1)) 
-        self.assert_(p.from_param(N.array([1]))) 
-        p = ndpointer(ndim=2) 
-        self.assert_(p.from_param(N.array([[1]]))) 
-         
-    def check_shape(self): 
-        p = ndpointer(shape=(1,2)) 
-        self.assert_(p.from_param(N.array([[1,2]]))) 
-        self.assertRaises(TypeError, p.from_param, N.array([[1],[2]])) 
-        p = ndpointer(shape=()) 
-        self.assert_(p.from_param(N.array(1))) 
- 
-    def check_flags(self): 
-        x = N.array([[1,2,3]], order='F') 
-        p = ndpointer(flags='FORTRAN') 
-        self.assert_(p.from_param(x)) 
-        p = ndpointer(flags='CONTIGUOUS') 
-        self.assertRaises(TypeError, p.from_param, x) 
-        p = ndpointer(flags=x.flags.num) 
-        self.assert_(p.from_param(x)) 
-        self.assertRaises(TypeError, p.from_param, N.array([[1,2,3]])) 
- 
-if __name__ == "__main__": 
-    NumpyTest().run() 
+
+    def check_ndim(self):
+        p = ndpointer(ndim=0)
+        self.assert_(p.from_param(N.array(1)))
+        self.assertRaises(TypeError, p.from_param, N.array([1]))
+        p = ndpointer(ndim=1)
+        self.assertRaises(TypeError, p.from_param, N.array(1))
+        self.assert_(p.from_param(N.array([1])))
+        p = ndpointer(ndim=2)
+        self.assert_(p.from_param(N.array([[1]])))
+
+    def check_shape(self):
+        p = ndpointer(shape=(1,2))
+        self.assert_(p.from_param(N.array([[1,2]])))
+        self.assertRaises(TypeError, p.from_param, N.array([[1],[2]]))
+        p = ndpointer(shape=())
+        self.assert_(p.from_param(N.array(1)))
+
+    def check_flags(self):
+        x = N.array([[1,2,3]], order='F')
+        p = ndpointer(flags='FORTRAN')
+        self.assert_(p.from_param(x))
+        p = ndpointer(flags='CONTIGUOUS')
+        self.assertRaises(TypeError, p.from_param, x)
+        p = ndpointer(flags=x.flags.num)
+        self.assert_(p.from_param(x))
+        self.assertRaises(TypeError, p.from_param, N.array([[1,2,3]]))
+
+if __name__ == "__main__":
+    NumpyTest().run()



More information about the Numpy-svn mailing list