Changeset 8445caf for fedd


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • fedd/federation/parse_detail.py

    r9556f2a r8445caf  
    11#!/usr/local/bin/python
    22
    3 from fedd_client import *
     3try:
     4    from fedd_services import *
     5except ImportError:
     6    from fedd_client import *
    47
    58from ZSI.TC import QName, String, URI, AnyElement, UNBOUNDED, Any
  • fedd/federation/remote_service.py

    r9556f2a r8445caf  
    300300        else:
    301301            request_message_name = "%sRequestMessage" % service_name
    302             try:
    303                 self.request_message = \
    304                         getattr(fedd_services, request_message_name, None) or \
    305                         getattr(fedd_internal_services, request_message_name,
    306                                 None)
    307             except NameError:
    308                 self.request_message = \
    309                         getattr(fedd_client, request_message_name, None) or \
    310                         getattr(fedd_internal_client, request_message_name,
    311                                 None)
     302            self.request_message = \
     303                    getattr(fedd_services, request_message_name, None) or \
     304                    getattr(fedd_internal_services, request_message_name,
     305                            None)
    312306            if not self.request_message and strict:
    313307                raise service_error(service_error.internal,
Note: See TracChangeset for help on using the changeset viewer.