[Ecell-cvs] SF.net SVN: ecell:[3889] ecell3/trunk/ecell/pyecell/ecell/session_manager

[<mor...@us...>]

Revision: 3889
          http://ecell.svn.sourceforge.net/ecell/?rev=3889&view=rev
Author:   moriyoshi
Date:     2011-01-11 08:26:12 +0000 (Tue, 11 Jan 2011)

Log Message:
-----------
* More 2.3 compatibility stuff.

Modified Paths:
--------------
    ecell3/trunk/ecell/pyecell/ecell/session_manager/Globus4Proxy.py
    ecell3/trunk/ecell/pyecell/ecell/session_manager/SessionManager.py

Modified: ecell3/trunk/ecell/pyecell/ecell/session_manager/Globus4Proxy.py
===================================================================
--- ecell3/trunk/ecell/pyecell/ecell/session_manager/Globus4Proxy.py	2011-01-09 03:51:36 UTC (rev 3888)
+++ ecell3/trunk/ecell/pyecell/ecell/session_manager/Globus4Proxy.py	2011-01-11 08:26:12 UTC (rev 3889)
@@ -102,10 +102,11 @@
     rft = u'http://www.globus.org/namespaces/2004/10/rft'
 
     def __metaclass__( name, base, dic ):
-        dic[ '__rev__' ] = dict( (
-            ( uri, prefix )
-                for prefix, uri in dic.iteritems()
-                if not prefix.startswith( '__' ) ) )
+        rev = {}
+        for prefix, uri in dic.iteritems():
+            if not prefix.startswith( '__' ):
+                rev[uri] = prefix
+        dic[ '__rev__' ] = rev
         return type( name, base, dic )
 
 class EPRParser( object ):
@@ -562,8 +563,10 @@
         for file in self.getExtraFileList():
             files.append( os.path.normpath(
                 os.path.join( absJobDirectory, file ) ) )
-        job.filesCleanedUp = job.filesStagedIn = (
-            'file://' + file for file in files )
+        urlifiedFiles = []
+        for file in files:
+            urlifiedFiles.append( "file://" + file )
+        job.filesCleanedUp = job.filesStagedIn = urlifiedFiles
         job.stdout =  os.path.normpath(
             os.path.join( absJobDirectory, self.getStdoutFileName() ) )
         job.stderr =  os.path.normpath(

Modified: ecell3/trunk/ecell/pyecell/ecell/session_manager/SessionManager.py
===================================================================
--- ecell3/trunk/ecell/pyecell/ecell/session_manager/SessionManager.py	2011-01-09 03:51:36 UTC (rev 3888)
+++ ecell3/trunk/ecell/pyecell/ecell/session_manager/SessionManager.py	2011-01-11 08:26:12 UTC (rev 3889)
@@ -559,8 +559,11 @@
         Return list : the list of AbstractSessionProxy
         '''
         # initializes a job list
-        return ( job for job in self.getSessionProxies() \
-                 if job.getStatus() == stat )
+        def generator():
+            for job in self.getSessionProxies():
+                if job.getStatus() == stat:
+                    yield job
+        return generator()
 
     def removeSessionProxy( self, job ):
         del self.jobs[ job.getJobID() ]


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.