From: Barış Metin <Talip-Baris.Metin@sophia.inria.fr>
Date: Fri, 12 Mar 2010 10:28:40 +0000 (+0000)
Subject: try fixing cyclic import
X-Git-Tag: PLCAPI-5.0-3^2~10
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=2047b9ace34cfa538917cdf4d4c2d7a621d840a4;p=plcapi.git

try fixing cyclic import
---

diff --git a/PLC/Peers.py b/PLC/Peers.py
index 13eaabcd..d6eef652 100644
--- a/PLC/Peers.py
+++ b/PLC/Peers.py
@@ -13,7 +13,7 @@ from PLC.Parameter import Parameter, Mixed
 from PLC.Filter import Filter
 from PLC.Table import Row, Table
 import PLC.Auth
-from PLC.Shell import *
+
 from PLC.Sites import Site, Sites
 from PLC.Persons import Person, Persons
 from PLC.Keys import Key, Keys
@@ -164,12 +164,11 @@ class Peer(Row):
              'peer_node_id': peer_node_id},
             commit = commit)
 
-        # calling UpdateNode with the node's hostname 
-        # will force the 'hrn' tag to be updated with the 
+        # calling UpdateNode with the node's hostname
+        # will force the 'hrn' tag to be updated with the
         # correct root auth
-        shell = Shell() 
-        UpdateNode = self.api.callable('UpdateNode')
-        UpdateNode(shell.auth, node['node_id'], {'hostname': node['hostname']})  
+        from PLC.Methods.UpdateNode import UpdateNode
+        UpdateNode.__call__(UpdateNode(self.api), auth, node['node_id'], {'hostname': node['hostname']})  
 
     def remove_node(self, node, commit = True):
         """
@@ -182,9 +181,8 @@ class Peer(Row):
         # calling UpdateNode with the node's hostname
         # will force the 'hrn' tag to be updated with the
         # correct root auth
-        shell = Shell() 
-        UpdateNode = self.api.callable('UpdateNode')
-        UpdateNode(shell.auth, node['node_id'], {'hostname': node['hostname']})
+        from PLC.Methods.UpdateNode import UpdateNode
+        UpdateNode.__call__(UpdateNode(self.api), auth, node['node_id'], {'hostname': node['hostname']})  
 
     def add_slice(self, slice, peer_slice_id, commit = True):
         """