Changeset 5658

Timestamp:

Aug 14, 2008, 1:24:02 PM (17 years ago)

Author:

ole

Message:

Added more input checks in Polygon_function

File:

• anuga_core/source/anuga/utilities/polygon.py (modified) (1 diff)

anuga_core/source/anuga/utilities/polygon.py

@@ -686 +686 @@
         except:
             msg = 'Polygon_function takes a list of pairs (polygon, value).'
-            msg += 'Got %s' %polygons
+            msg += 'Got %s' %regions
             raise msg
 
 
         T = regions[0]
+
+        if isinstance(T, basestring):
+            msg = 'You passed in a list of text values into polygon_function'
+            msg += ' instead of a list of pairs (polygon, value): "%s"' %T
+            
+            raise Exception, msg
+        
         try:
             a = len(T)
         except:
             msg = 'Polygon_function takes a list of pairs (polygon, value).'
-            msg += 'Got %s' %polygons
+            msg += 'Got %s' %str(T)
             raise msg
 
-        assert a == 2, 'Must have two component each: %s' %T
+        msg = 'Each entry in regions have two components: (polygon, value).'
+        msg +='I got %s' %str(T)
+        assert a == 2, msg