Changeset 8445caf

Timestamp:

Dec 7, 2010 1:08:20 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

cd5d16e

Parents:

9556f2a

Message:

Missed a couple try blocks that must go.

Location:

fedd/federation

Files:

• parse_detail.py (modified) (1 diff)
• remote_service.py (modified) (1 diff)

fedd/federation/parse_detail.py

@@ -1 +1 @@
 #!/usr/local/bin/python
 
-from fedd_client import *
+try:
+    from fedd_services import *
+except ImportError:
+    from fedd_client import *
 
 from ZSI.TC import QName, String, URI, AnyElement, UNBOUNDED, Any

fedd/federation/remote_service.py

@@ -300 +300 @@
         else:
             request_message_name = "%sRequestMessage" % service_name
-            try:
-                self.request_message = \
-                        getattr(fedd_services, request_message_name, None) or \
-                        getattr(fedd_internal_services, request_message_name,
-                                None)
-            except NameError:
-                self.request_message = \
-                        getattr(fedd_client, request_message_name, None) or \
-                        getattr(fedd_internal_client, request_message_name, 
-                                None)
+            self.request_message = \
+                    getattr(fedd_services, request_message_name, None) or \
+                    getattr(fedd_internal_services, request_message_name,
+                            None)
             if not self.request_message and strict:
                 raise service_error(service_error.internal,