Changeset ec4fb42 for fedd/fedd/fedd_deter_impl.py

Timestamp:

Nov 30, 2008 9:19:33 AM (15 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:

7454054

Parents:

f0dc2ca

Message:

Clean up some names that start with fedd_ that are ugly with the new package
structure. A couple other bugs cleaned up, too.

File:

• fedd/fedd/fedd_deter_impl.py (modified) (4 diffs)

fedd/fedd/fedd_deter_impl.py

@@ -1 +1 @@
 #!/usr/local/bin/python
 
-from fedd_access import fedd_access
-from fedd_experiment_control import fedd_experiment_control_local
-from fedd_split import fedd_split_local
+from access import access
+from experiment_control import experiment_control_local
+from split import split_local
 
 from authorizer import authorizer
@@ -20 +20 @@
     def __init__(self, config=None):
         """
-        Initializer.  Parses a configuration if one is given.
+        Initializer.  Uses the parsed configuration to create appropriate
+        components.
         """
         self.soap_services = { }
@@ -32 +33 @@
 
             if config.has_section("access"):
-                self.access = fedd_access(config, self.auth)
+                self.access = access(config, self.auth)
                 self.soap_services.update(self.access.soap_services) 
                 self.xmlrpc_services.update(self.access.xmlrpc_services) 
@@ -38 +39 @@
             if config.has_section("experiment_control"):
                 self.experiment = \
-                        fedd_experiment_control_local(config, self.auth)
+                        experiment_control_local(config, self.auth)
                 self.soap_services.update(self.experiment.soap_services) 
                 self.xmlrpc_services.update(self.experiment.xmlrpc_services) 
 
             if config.has_section("splitter"):
-                self.splitter = fedd_split_local(config, self.auth)
+                self.splitter = split_local(config, self.auth)
                 self.soap_services.update(self.splitter.soap_services) 
                 self.xmlrpc_services.update(self.splitter.xmlrpc_services)