From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 17 Nov 2006 09:57:28 +0000 (+0000)
Subject: oops, probably broke the build - my mistake
X-Git-Tag: pycurl-7_13_1~285
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=98015aae65d8540ed1f09e982fb492bf40b08612;p=plcapi.git

oops, probably broke the build - my mistake
this change was need togother with another one I made yesterday on
AddSliceToNodes.py DeleteSliceFromNodes.py
remove ugly hack - just assert node isinstance of Node OR ForeignNode
---

diff --git a/PLC/Slices.py b/PLC/Slices.py
index 82bcad58..2707a89b 100644
--- a/PLC/Slices.py
+++ b/PLC/Slices.py
@@ -125,16 +125,13 @@ class Slice(Row):
             self['person_ids'].remove(person_id)
             person['slice_ids'].remove(slice_id)
 
-    def add_node(self, node, is_foreign_node = False, commit = True):
+    def add_node(self, node, commit = True):
         """
         Add node to existing slice.
         """
 
         assert 'slice_id' in self
-        if not is_foreign_node:
-            assert isinstance(node, Node)
-        else:
-            assert isinstance(node, ForeignNode)
+        assert isinstance(node, (Node,ForeignNode))
         assert 'node_id' in node
 
         slice_id = self['slice_id']
@@ -153,16 +150,13 @@ class Slice(Row):
             self['node_ids'].append(node_id)
             node['slice_ids'].append(slice_id)
 
-    def remove_node(self, node, is_foreign_node = False, commit = True):
+    def remove_node(self, node, commit = True):
         """
         Remove node from existing slice.
         """
 
         assert 'slice_id' in self
-        if not is_foreign_node:
-            assert isinstance(node, Node)
-        else:
-            assert isinstance(node, ForeignNode)
+        assert isinstance(node, (Node,ForeignNode))
         assert 'node_id' in node
 
         slice_id = self['slice_id']