Be consistent in the API.

[plcapi.git] / PLC / NodeTags.py

diff --git a/PLC/NodeTags.py b/PLC/NodeTags.py
index b177e49..9e29192 100644 (file)
--- a/PLC/NodeTags.py
+++ b/PLC/NodeTags.py
@@ -43,12 +43,10 @@ class NodeTags(Table):
               ", ".join(self.columns)
 
         if node_tag_filter is not None:
-            if isinstance(node_tag_filter, (list, tuple, set)):
+            if isinstance(node_tag_filter, (list, tuple, set, int, long)):
                 node_tag_filter = Filter(NodeTag.fields, {'node_tag_id': node_tag_filter})
             elif isinstance(node_tag_filter, dict):
                 node_tag_filter = Filter(NodeTag.fields, node_tag_filter)
-            elif isinstance(node_tag_filter, int):
-                node_tag_filter = Filter(NodeTag.fields, {'node_tag_id': [node_tag_filter]})
             else:
                 raise PLCInvalidArgument, "Wrong node tag filter %r"%node_tag_filter
             sql += " AND (%s) %s" % node_tag_filter.sql(api)