Changeset 8125 for trunk/anuga_core/source/anuga/file_conversion/urs2sts.py

Timestamp:

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

Author:

wilsonr

Message:

Changes to address ticket 360.

File:

• trunk/anuga_core/source/anuga/file_conversion/urs2sts.py (modified) (2 diffs)

trunk/anuga_core/source/anuga/file_conversion/urs2sts.py

@@ -83 +83 @@
     import os
     from Scientific.IO.NetCDF import NetCDFFile
-    from types import ListType,StringType
     from operator import __and__
 
-    if not isinstance(basename_in, ListType):
+    if not isinstance(basename_in, list):
         if verbose: log.critical('Reading single source')
         basename_in = [basename_in]
@@ -96 +95 @@
 
     # Check that basename is a list of strings
-    if not reduce(__and__, map(lambda z:isinstance(z,StringType), basename_in)):
+    if not reduce(__and__, map(lambda z:isinstance(z,basestring), basename_in)):
         msg= 'basename_in must be a string or list of strings'
         raise Exception, msg