====

[plcapi.git] / PLC / PersonTags.py

diff --git a/PLC/PersonTags.py b/PLC/PersonTags.py
index 1809470..9327abf 100644 (file)
--- a/PLC/PersonTags.py
+++ b/PLC/PersonTags.py
@@ -1,10 +1,6 @@
-# $Id: PersonTags.py 14587 2009-07-19 13:18:50Z thierry $
-# $URL: http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.3-27/PLC/PersonTags.py $
 #
 # Thierry Parmentelat - INRIA
 #
-# $Revision: 14587 $
-#
 from PLC.Faults import *
 from PLC.Parameter import Parameter
 from PLC.Filter import Filter
@@ -28,10 +24,9 @@ class PersonTag(Row):
         'tagname': TagType.fields['tagname'],
         'description': TagType.fields['description'],
         'category': TagType.fields['category'],
-        'min_role_id': TagType.fields['min_role_id'],
         'value': Parameter(str, "Person setting value"),
-       ### relations
-       
+        ### relations
+
         }
 
 class PersonTags(Table):
@@ -47,12 +42,10 @@ class PersonTags(Table):
               ", ".join(self.columns)
 
         if person_tag_filter is not None:
-            if isinstance(person_tag_filter, (list, tuple, set)):
+            if isinstance(person_tag_filter, (list, tuple, set, int, long)):
                 person_tag_filter = Filter(PersonTag.fields, {'person_tag_id': person_tag_filter})
             elif isinstance(person_tag_filter, dict):
                 person_tag_filter = Filter(PersonTag.fields, person_tag_filter)
-            elif isinstance(person_tag_filter, int):
-                person_tag_filter = Filter(PersonTag.fields, {'person_tag_id': [person_tag_filter]})
             else:
                 raise PLCInvalidArgument, "Wrong person setting filter %r"%person_tag_filter
             sql += " AND (%s) %s" % person_tag_filter.sql(api)