Changeset 0a49bd7 for fedd/federation/parse_detail.py

Timestamp:

Jan 15, 2011 5:52:15 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

aaf7f41

Parents:

ac15159 (diff), 944b746 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Ted Faber <faber@…> (01/15/11 17:51:40)

git-committer:

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

Message:

merge from current

File:

• fedd/federation/parse_detail.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