Changeset 6a0c9f4

Timestamp:

Nov 30, 2008 9:54:06 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:

0e41546

Parents:

f831203

Message:

More namespace cleanup

Location:

fedd

Files:

• fedd.py (modified) (1 diff)
• fedd/access.py (modified) (1 diff)
• fedd/experiment_control.py (modified) (1 diff)
• fedd/remote_service.py (modified) (2 diffs)
• fedd/split.py (modified) (1 diff)
• fedd_client.py (modified) (1 diff)

fedd/fedd.py

@@ -5 +5 @@
 from optparse import OptionParser
 
+from fedd import config_parser
 from fedd.server import server, xmlrpc_handler, soap_handler
-from fedd.config_parser import config_parser
 from fedd.util import fedd_ssl_context
 from fedd.deter_impl import new_feddservice
 
-from threading import *
+from threading import Lock, Thread
 from signal import signal, pause, SIGINT, SIGTERM
 from select import select, error

fedd/fedd/access.py

@@ -16 +16 @@
 from fedid import fedid, generate_fedid
 from authorizer import authorizer
-import parse_detail
-from service_error import *
+from service_error import service_error
 from remote_service import xmlrpc_handler, soap_handler, service_caller
 

fedd/fedd/experiment_control.py

@@ -24 +24 @@
 from fedid import fedid, generate_fedid
 from remote_service import xmlrpc_handler, soap_handler, service_caller
-import parse_detail
 from service_error import service_error
 

fedd/fedd/remote_service.py

@@ -6 +6 @@
 
 import M2Crypto.httpslib
+from M2Crypto import SSL
 from M2Crypto.m2xmlrpclib import SSL_Transport
 from M2Crypto.SSL import SSLError
@@ -15 +16 @@
 from util import fedd_ssl_context
 from fedid import fedid
-
+import parse_detail
+
+# Turn off the matching of hostname to certificate ID
+SSL.Connection.clientPostConnectionCheck = None
 
 # Used by the remote_service_base class.

fedd/fedd/split.py

@@ -11 +11 @@
 from fedid import fedid
 from remote_service import xmlrpc_handler, soap_handler
-import parse_detail
 from service_error import *
 

fedd/fedd_client.py

@@ -8 +8 @@
 from fedd.fedd_internal_services import *
 
-from M2Crypto import SSL, X509
-from M2Crypto.m2xmlrpclib import SSL_Transport
-import M2Crypto.httpslib
-
-from xmlrpclib import ServerProxy, Error, dumps, loads
-from ZSI.TC import QName, String, URI, AnyElement, UNBOUNDED, Any
-from ZSI.wstools.Namespaces import SOAP
-from ZSI.fault import FaultType, Detail
-
-import xmlrpclib
-
+from fedd import fedid, service_error
 from fedd.util import fedd_ssl_context, pack_id, unpack_id
-from fedd.fedid import fedid
 from fedd.remote_service import service_caller
-from fedd.service_error import *
-import fedd.parse_detail
 
 from optparse import OptionParser, OptionValueError
 
-
-# Turn off the matching of hostname to certificate ID
-SSL.Connection.clientPostConnectionCheck = None
 
 class IDFormatException(RuntimeError): pass