Index: ../trunk-jpl/src/m/classes/organizer.py
===================================================================
--- ../trunk-jpl/src/m/classes/organizer.py	(revision 13952)
+++ ../trunk-jpl/src/m/classes/organizer.py	(revision 13953)
@@ -4,6 +4,7 @@
 from loadvars import *
 from loadmodel import *
 from savevars import *
+from model import model
 
 class organizer(object):
 	"""
@@ -43,7 +44,7 @@
 
 		#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):
 			raise IOError("Directory '%s' not found" % repository)
@@ -55,7 +56,7 @@
 		#Get trunk prefix (only if provided by user)
 		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:
 				raise TypeError("trunkprefix should not have any white space")
@@ -136,7 +137,7 @@
 		self._currentstep+=1
 
 		#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
 			print "   step #%2i : %s" % (self.steps[self._currentstep-1]['id'],self.steps[self._currentstep-1]['string'])