From 2047b9ace34cfa538917cdf4d4c2d7a621d840a4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Fri, 12 Mar 2010 10:28:40 +0000 Subject: [PATCH 1/1] try fixing cyclic import --- PLC/Peers.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/PLC/Peers.py b/PLC/Peers.py index 13eaabc..d6eef65 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): """ -- 2.43.0