git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a323a49
)
resolve circular import
author
Tony Mack
<tmack@cs.princeton.edu>
Tue, 6 Apr 2010 17:39:11 +0000
(17:39 +0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Tue, 6 Apr 2010 17:39:11 +0000
(17:39 +0000)
sfa/util/api.py
patch
|
blob
|
history
diff --git
a/sfa/util/api.py
b/sfa/util/api.py
index
ca2557f
..
099f079
100644
(file)
--- a/
sfa/util/api.py
+++ b/
sfa/util/api.py
@@
-19,8
+19,6
@@
from sfa.trust.credential import *
from sfa.trust.certificate import *
from sfa.util.namespace import *
from sfa.util.sfalogging import *
from sfa.trust.certificate import *
from sfa.util.namespace import *
from sfa.util.sfalogging import *
-from sfa.server.registry import Registries
-from sfa.server.aggregate import Aggregates
# See "2.2 Characters" in the XML specification:
#
# See "2.2 Characters" in the XML specification:
#
@@
-129,9
+127,11
@@
class BaseAPI:
self.logger=get_sfa_logger()
# load registries
self.logger=get_sfa_logger()
# load registries
+ from sfa.server.registry import Registries
self.registries = Registries(self)
# load aggregates
self.registries = Registries(self)
# load aggregates
+ from sfa.server.aggregate import Aggregates
self.aggregates = Aggregates(self)
self.aggregates = Aggregates(self)