blind 2to3

[plcapi.git] / PLC / Methods / DeleteSiteTag.py

diff --git a/PLC/Methods/DeleteSiteTag.py b/PLC/Methods/DeleteSiteTag.py
index 601b1c0..726420a 100644 (file)
--- a/PLC/Methods/DeleteSiteTag.py
+++ b/PLC/Methods/DeleteSiteTag.py
@@ -7,10 +7,10 @@ from PLC.Parameter import Parameter, Mixed
 from PLC.Auth import Auth
 
 from PLC.Sites import Site, Sites
-from PLC.Nodes import Nodes
 from PLC.TagTypes import TagType, TagTypes
 from PLC.SiteTags import SiteTag, SiteTags
 
+# need to import so the core classes get decorated with caller_may_write_tag
 from PLC.AuthorizeHelpers import AuthorizeHelpers
 
 class DeleteSiteTag(Method):
@@ -36,7 +36,7 @@ class DeleteSiteTag(Method):
     def call(self, auth, site_tag_id):
         site_tags = SiteTags(self.api, [site_tag_id])
         if not site_tags:
-            raise PLCInvalidArgument, "No such site tag %r"%site_tag_id
+            raise PLCInvalidArgument("No such site tag %r"%site_tag_id)
         site_tag = site_tags[0]
 
         tag_type_id = site_tag['tag_type_id']
@@ -44,19 +44,12 @@ class DeleteSiteTag(Method):
 
         sites = Sites (self.api, site_tag['site_id'])
         if not sites:
-            raise PLCInvalidArgument, "No such site %d"%site_tag['site_id']
+            raise PLCInvalidArgument("No such site %d"%site_tag['site_id'])
         site=sites[0]
         
         # check authorizations
-        if 'admin' in self.caller['roles']:
-            pass
-        elif not AuthorizeHelpers.caller_may_access_tag_type (self.api, self.caller, tag_type):
-            raise PLCPermissionDenied, "%s, forbidden tag %s"%(self.name,tag_type['tagname'])
-        elif AuthorizeHelpers.person_in_site (self.api, self.caller, site):
-            pass
-        else:
-            raise PLCPermissionDenied, "%s: you must be part of the subject site"%self.name
-            
+        site.caller_may_write_tag(self.api,self.caller,tag_type)
+
         site_tag.delete()
         self.object_ids = [site_tag['site_tag_id']]