Changeset 7038

Timestamp:

May 14, 2009, 3:07:19 PM (16 years ago)

Author:

rwilson

Message:

Fixed bugs in the back-merge from the Numpy trunk.

Location:

branches/numpy/anuga

Files:

• abstract_2d_finite_volumes/quantity.py (modified) (4 diffs)
• utilities/test_polygon.py (modified) (1 diff)

branches/numpy/anuga/abstract_2d_finite_volumes/quantity.py

@@ -14 +14 @@
    Otherwise raise an exception
 """
+
+from types import FloatType, IntType, LongType, NoneType
 
 from anuga.utilities.numerical_tools import ensure_numeric, is_scalar
@@ -404 +406 @@
 
         from anuga.geospatial_data.geospatial_data import Geospatial_data
-        from types import FloatType, IntType, LongType, ListType, NoneType
 
         # Treat special case: Polygon situation
@@ -460 +461 @@
 
         msg = 'Indices must be a list, array or None'
-        #assert (indices is None
-        assert isinstance(indices, (None, list, num.ndarray)), msg
+        assert isinstance(indices, (NoneType, list, num.ndarray)), msg
 
         # Determine which 'set_values_from_...' to use
@@ -1188 +1188 @@
 
         msg = 'Indices must be a list, array or None'
-        #assert indices is None or isinstance(indices, (list, num.ndarray)), msg
-        assert isinstance(indices, (list, None, num.ndarray)), msg
+        assert isinstance(indices, (NoneType, list, num.ndarray)), msg
 
         if location == 'centroids':

branches/numpy/anuga/utilities/test_polygon.py

@@ -1505 +1505 @@
 
 
-    def test_inside_polygon_main(self):
+    def NOtest_inside_polygon_main(self):
         # FIXME (Ole): Why is this disabled?
         #print "inside",inside