Changeset aaf7f41 for fedd/federation

Timestamp:

Jan 15, 2011 5:56:33 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

b4e5366

Parents:

0a49bd7

git-author:

Ted Faber <faber@…> (01/15/11 17:56:04)

git-committer:

Ted Faber <faber@…> (01/15/11 17:56:33)

Message:

Fix a Bad merge.

File:

• fedd/federation/remote_service.py (modified) (2 diffs)

fedd/federation/remote_service.py

@@ -294 +294 @@
         self.service_name = service_name
 
-<<<<<<< HEAD
-        try:
-            if getattr(fedd_services.feddBindingSOAP, service_name, None):
-                self.locator = fedd_services.feddServiceLocator
-                self.port_name = 'getfeddPortType'
-            elif getattr(fedd_internal_services.feddInternalBindingSOAP, 
-                    service_name, None):
-                self.locator = fedd_internal_services.feddInternalServiceLocator
-                self.port_name = 'getfeddInternalPortType'
-        except NameError:
-            if getattr(fedd_client.feddBindingSOAP, service_name, None):
-                self.locator = fedd_client.feddServiceLocator
-                self.port_name = 'getfeddPort'
-            elif getattr(fedd_internal_client.feddInternalBindingSOAP, 
-                    service_name, None):
-                self.locator = fedd_internal_client.feddInternalServiceLocator
-                self.port_name = 'getfedd_internalPort'
-
-=======
         if getattr(fedd_services.feddBindingSOAP, service_name, None):
             self.locator = fedd_services.feddServiceLocator
@@ -320 +301 @@
             self.locator = fedd_internal_services.feddInternalServiceLocator
             self.port_name = internal_service_port_name
->>>>>>> 944b746d2f97c5803ca28f587dd7100a57e25a69
 
         if request_message: self.request_message = request_message
         else:
             request_message_name = "%sRequestMessage" % service_name
-<<<<<<< HEAD
-            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)
->>>>>>> 944b746d2f97c5803ca28f587dd7100a57e25a69
             if not self.request_message and strict:
                 raise service_error(service_error.internal,