Changeset 6899

Timestamp:

27/05/10 23:11:42 (11 years ago)

Author:

astephen

Message:

fixed

Location:

cows_wps/trunk/cows_wps

Files:

• renderer/ui_renderer.py (modified) (1 diff)
• sge/sge_py_int.py (modified) (1 diff)
• utils/common.py (modified) (3 diffs)

cows_wps/trunk/cows_wps/renderer/ui_renderer.py

@@ -17 +17 @@
         self.template_dir = config["wps.template_dir"]
         self.templateLoader = TemplateLoader(self.template_dir, auto_reload=True)
-#           os.path.join("/usr/local/cwps/cows_wps", 'cows_wps/templates'),
-#           auto_reload=True)
 
     def _htmlifyItems(self, items):

cows_wps/trunk/cows_wps/sge/sge_py_int.py

@@ -97 +97 @@
             
         if output:
-            log.debug("stdout form qsub: %s" % (output,))
+            log.debug("stdout from qsub: %s" % (output,))
 
         # Read stout to get the job id

cows_wps/trunk/cows_wps/utils/common.py

@@ -15 +15 @@
 import string
 import datetime
+
 from cows_wps.utils import case_sensitive_ordered_config_parser as cp
 
@@ -197 +198 @@
 
 def stringToDateTime(timeString, format="%Y-%m-%d %H:%M:%S", includeMicroseconds=False):
-    
+   
     if includeMicroseconds:
-        p1, p2 = timeString.split(".",1)
+        p1, p2 = str(timeString).split(".",1)
         d = datetime.datetime.strptime(p1, format)
         d = d.replace(microsecond = int(p2))
@@ -244 +245 @@
     
     return processCallable
+
 
 if __name__ == "__main__":