Changeset 13953

Timestamp:

11/14/12 12:38:29 (12 years ago)

Author:

cborstad

Message:

BUG: minor syntax fixes for python organizer class

File:

• issm/trunk-jpl/src/m/classes/organizer.py (modified) (4 diffs)

issm/trunk-jpl/src/m/classes/organizer.py ¶

@@ -5 +5 @@
 from loadmodel import *
 from savevars import *
+from model import model
 
 class organizer(object):
@@ -44 +45 @@
                 #Get repository
                 repository=options.getfieldvalue('repository','./')
-                if not isinstance(repository(str,unicode)):
+                if not isinstance(repository,(str,unicode)):
                         raise TypeError("repository is not a string")
                 if not os.path.isdir(repository):
@@ -56 +57 @@
                 if options.exist('trunkprefix'):
                         trunkprefix=options.getfieldvalue('trunkprefix','')
-                        if not isinstance(trunkprefix(str,unicode)):
+                        if not isinstance(trunkprefix,(str,unicode)):
                                 raise TypeError("trunkprefix is not a string")
                         if not strcmp(trunkprefix,trunkprefix.strip()) or len(trunkprefix.split()) > 1:
@@ -137 +138 @@
 
                 #if requestedsteps = 0, print all steps in self 
-                if any(self.requestedsteps==0):
+                if 0 in self.requestedsteps:
                         if self._currentstep==1:
                                 print "   prefix: %s" % self.prefix