Changeset 8125 for trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/generic_domain.py

Timestamp:

Mar 4, 2011, 2:34:28 PM (13 years ago)

Author:

wilsonr

Message:

Changes to address ticket 360.

File:

• trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/generic_domain.py (modified) (4 diffs)

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/generic_domain.py

@@ -13 +13 @@
 """
 
-import types
 from time import time as walltime
 
@@ -90 +89 @@
         
         # Determine whether source is a mesh filename or coordinates
-        if type(source) == types.StringType:
+        if isinstance(source, basestring):
             mesh_filename = source
         else:
@@ -861 +860 @@
     def _set_region(self, functions):
         # coerce to an iterable (list or tuple)
-        if type(functions) not in [types.ListType, types.TupleType]:
+        if not isinstance(functions, (list, tuple)):
             functions = [functions]
 
@@ -1160 +1159 @@
         if quantities is None:
             quantities = self.evolved_quantities
-        elif type(quantities) == types.StringType:
+        elif isinstance(quantities, basestring):
             quantities = [quantities] #Turn it into a list
 
         msg = ('Keyword argument quantities must be either None, '
                'string or list. I got %s') % str(quantities)
-        assert type(quantities) == types.ListType, msg
+        assert isinstance(quantities, list), msg
 
         if tags is None:
             tags = self.get_boundary_tags()
-        elif type(tags) == types.StringType:
+        elif isinstance(tags, basestring):
             tags = [tags] #Turn it into a list
 
         msg = ('Keyword argument tags must be either None, '
                'string or list. I got %s') % str(tags)
-        assert type(tags) == types.ListType, msg
+        assert isinstance(tags, list), msg
 
         # Determine width of longest quantity name (for cosmetic purposes)