[Scipy-svn] r6740 - trunk/scipy/ndimage

[scipy-svn at scipy.org]

Author: ptvirtan
Date: 2010-09-11 19:55:35 -0500 (Sat, 11 Sep 2010)
New Revision: 6740

Modified:
   trunk/scipy/ndimage/filters.py
Log:
3K: ndimage: avoid clash with filter() and 2to3

Modified: trunk/scipy/ndimage/filters.py
===================================================================
--- trunk/scipy/ndimage/filters.py	2010-09-12 00:55:22 UTC (rev 6739)
+++ trunk/scipy/ndimage/filters.py	2010-09-12 00:55:35 UTC (rev 6740)
@@ -750,12 +750,12 @@
         axes = [(axes[ii], sizes[ii], origins[ii])
                                for ii in range(len(axes)) if sizes[ii] > 1]
         if minimum:
-            filter = minimum_filter1d
+            filter_ = minimum_filter1d
         else:
-            filter = maximum_filter1d
+            filter_ = maximum_filter1d
         if len(axes) > 0:
             for axis, size, origin in axes:
-                filter(input, int(size), axis, output, mode, cval, origin)
+                filter_(input, int(size), axis, output, mode, cval, origin)
                 input = output
         else:
             output[...] = input[...]