Changeset aaf7f41


Ignore:
Timestamp:
Jan 15, 2011 5:56:33 PM (13 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:
1 edited

Legend:

Unmodified
Added
Removed
  • fedd/federation/remote_service.py

    r0a49bd7 raaf7f41  
    294294        self.service_name = service_name
    295295
    296 <<<<<<< HEAD
    297         try:
    298             if getattr(fedd_services.feddBindingSOAP, service_name, None):
    299                 self.locator = fedd_services.feddServiceLocator
    300                 self.port_name = 'getfeddPortType'
    301             elif getattr(fedd_internal_services.feddInternalBindingSOAP,
    302                     service_name, None):
    303                 self.locator = fedd_internal_services.feddInternalServiceLocator
    304                 self.port_name = 'getfeddInternalPortType'
    305         except NameError:
    306             if getattr(fedd_client.feddBindingSOAP, service_name, None):
    307                 self.locator = fedd_client.feddServiceLocator
    308                 self.port_name = 'getfeddPort'
    309             elif getattr(fedd_internal_client.feddInternalBindingSOAP,
    310                     service_name, None):
    311                 self.locator = fedd_internal_client.feddInternalServiceLocator
    312                 self.port_name = 'getfedd_internalPort'
    313 
    314 =======
    315296        if getattr(fedd_services.feddBindingSOAP, service_name, None):
    316297            self.locator = fedd_services.feddServiceLocator
     
    320301            self.locator = fedd_internal_services.feddInternalServiceLocator
    321302            self.port_name = internal_service_port_name
    322 >>>>>>> 944b746d2f97c5803ca28f587dd7100a57e25a69
    323303
    324304        if request_message: self.request_message = request_message
    325305        else:
    326306            request_message_name = "%sRequestMessage" % service_name
    327 <<<<<<< HEAD
    328             try:
    329                 self.request_message = \
    330                         getattr(fedd_services, request_message_name, None) or \
    331                         getattr(fedd_internal_services, request_message_name,
    332                                 None)
    333             except NameError:
    334                 self.request_message = \
    335                         getattr(fedd_client, request_message_name, None) or \
    336                         getattr(fedd_internal_client, request_message_name,
    337                                 None)
    338 =======
    339307            self.request_message = \
    340308                    getattr(fedd_services, request_message_name, None) or \
    341309                    getattr(fedd_internal_services, request_message_name,
    342310                            None)
    343 >>>>>>> 944b746d2f97c5803ca28f587dd7100a57e25a69
    344311            if not self.request_message and strict:
    345312                raise service_error(service_error.internal,
Note: See TracChangeset for help on using the changeset viewer.