====

[plcapi.git] / PLC / SiteTags.py

diff --git a/PLC/SiteTags.py b/PLC/SiteTags.py
index 53634ab..d04b947 100644 (file)
--- a/PLC/SiteTags.py
+++ b/PLC/SiteTags.py
@@ -1,5 +1,3 @@
-# $Id: SiteTags.py 14587 2009-07-19 13:18:50Z thierry $
-# $URL: http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.3-27/PLC/SiteTags.py $
 #
 # Thierry Parmentelat - INRIA
 #
@@ -26,10 +24,9 @@ class SiteTag(Row):
         'tagname': TagType.fields['tagname'],
         'description': TagType.fields['description'],
         'category': TagType.fields['category'],
-        'min_role_id': TagType.fields['min_role_id'],
         'value': Parameter(str, "Site setting value"),
-       ### relations
-       
+        ### relations
+
         }
 
 class SiteTags(Table):
@@ -45,12 +42,10 @@ class SiteTags(Table):
               ", ".join(self.columns)
 
         if site_tag_filter is not None:
-            if isinstance(site_tag_filter, (list, tuple, set)):
+            if isinstance(site_tag_filter, (list, tuple, set, int, long)):
                 site_tag_filter = Filter(SiteTag.fields, {'site_tag_id': site_tag_filter})
             elif isinstance(site_tag_filter, dict):
                 site_tag_filter = Filter(SiteTag.fields, site_tag_filter)
-            elif isinstance(site_tag_filter, int):
-                site_tag_filter = Filter(SiteTag.fields, {'site_tag_id': [site_tag_filter]})
             else:
                 raise PLCInvalidArgument, "Wrong site setting filter %r"%site_tag_filter
             sql += " AND (%s) %s" % site_tag_filter.sql(api)