Changeset c971895

Timestamp:

Nov 21, 2008 11:15:49 AM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-1.30, version-2.00, version-3.01, version-3.02

Children:

3f6bc5f

Parents:

51cc9df

Message:

clean up imports

Location:

fedd

Files:

• fedd_access.py (modified) (1 diff)
• fedd_allocate_project.py (modified) (1 diff)
• fedd_experiment_control.py (modified) (3 diffs)
• fedd_split.py (modified) (4 diffs)

fedd/fedd_access.py

@@ -2 +2 @@
 
 import os,sys
-
-from BaseHTTPServer import BaseHTTPRequestHandler
-from ZSI import *
-from M2Crypto import SSL
-from M2Crypto.m2xmlrpclib import SSL_Transport
-from M2Crypto.SSL.SSLServer import SSLServer
-import M2Crypto.httpslib
-import xmlrpclib
-
 import re
 import string
 import copy
 import pickle
+import logging
 
 from threading import *
 
-from fedd_access_project import access_project
 from fedd_services import *
 from fedd_util import *
 from fedd_allocate_project import *
+from fedd_access_project import access_project
 from fedid import fedid, generate_fedid
 import parse_detail
 from service_error import *
 from remote_service import xmlrpc_handler, soap_handler, service_caller
-import logging
 
 

fedd/fedd_allocate_project.py

@@ -2 +2 @@
 
 import os,sys
-
-from BaseHTTPServer import BaseHTTPRequestHandler
-from ZSI import *
-from M2Crypto import SSL
-from M2Crypto.m2xmlrpclib import SSL_Transport
-from M2Crypto.SSL.SSLServer import SSLServer
-import M2Crypto.httpslib
-import xmlrpclib
-
 import re
 import random

fedd/fedd_experiment_control.py

@@ -3 +3 @@
 import os,sys
 
-from ZSI import *
-from M2Crypto import SSL
-from M2Crypto.SSL.SSLServer import SSLServer
-import M2Crypto.httpslib
-
-import xml.parsers.expat
 
 import re
@@ -17 +11 @@
 import copy
 import pickle
+import logging
 
 import traceback
+# For parsing visualization output and splitter output
+import xml.parsers.expat
 
 from threading import *
-
 from subprocess import *
 
@@ -30 +26 @@
 from remote_service import xmlrpc_handler, soap_handler, service_caller
 import parse_detail
-from service_error import *
-
-import logging
+from service_error import service_error
+
 
 class nullHandler(logging.Handler):

fedd/fedd_split.py

@@ -2 +2 @@
 
 import os,sys
-
-from ZSI import *
-from M2Crypto import SSL
-from M2Crypto.SSL.SSLServer import SSLServer
-import M2Crypto.httpslib
-
-import xml.parsers.expat
-
-import re
-import random
-import string
 import subprocess
 import tempfile
-import copy
-import pickle
-
-import traceback
-
-from threading import *
-
-from subprocess import *
+import logging
 
 from fedd_services import *
@@ -32 +14 @@
 from service_error import *
 
-import logging
 
 class nullHandler(logging.Handler):
@@ -59 +40 @@
 
         self.log = logging.getLogger("fedd.splitter")
+        set_log_level(config, "splitter", self.log)
         self.trace_file = sys.stderr
 
@@ -134 +116 @@
         tclcmd.extend([pid, gid, eid, tclfile])
         self.log.debug("Calling splitter %s" % " ".join(tclcmd))
-        tclparser = Popen(tclcmd, stdout=PIPE)
+        tclparser = subprocess.Popen(tclcmd, stdout=subprocess.PIPE)
 
         out = ""