blind 2to3

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

diff --git a/PLC/Methods/UpdateTagType.py b/PLC/Methods/UpdateTagType.py
index 56bd61f..5f56b2d 100644 (file)
--- a/PLC/Methods/UpdateTagType.py
+++ b/PLC/Methods/UpdateTagType.py
@@ -7,7 +7,7 @@ from PLC.Parameter import Parameter, Mixed
 from PLC.TagTypes import TagType, TagTypes
 from PLC.Auth import Auth
 
-can_update = lambda (field, value): field in \
+can_update = lambda field_value: field_value[0] in \
              ['tagname', 'description', 'category']
 
 class UpdateTagType(Method):
@@ -20,7 +20,7 @@ class UpdateTagType(Method):
 
     roles = ['admin']
 
-    tag_type_fields = dict(filter(can_update, TagType.fields.items()))
+    tag_type_fields = dict(list(filter(can_update, list(TagType.fields.items()))))
 
     accepts = [
         Auth(),
@@ -32,14 +32,21 @@ class UpdateTagType(Method):
     returns = Parameter(int, '1 if successful')
 
     def call(self, auth, tag_type_id_or_name, tag_type_fields):
-        tag_type_fields = dict(filter(can_update, tag_type_fields.items()))
+        
+        accepted_type_fields = dict(list(filter(can_update, list(tag_type_fields.items()))))
+        rejected_keys = [ k for k in tag_type_fields if k not in accepted_type_fields ]
+        if rejected_keys:
+            error="Cannot update TagType column(s) %r"%rejected_keys
+            if 'roles' in rejected_keys or 'role_ids' in rejected_keys:
+                error += " see AddRoleToTagType DeleteRoleFromTagType"
+            raise PLCInvalidArgument(error)
 
         tag_types = TagTypes(self.api, [tag_type_id_or_name])
         if not tag_types:
-            raise PLCInvalidArgument, "No such tag type"
+            raise PLCInvalidArgument("No such tag type")
         tag_type = tag_types[0]
 
-        tag_type.update(tag_type_fields)
+        tag_type.update(accepted_type_fields)
         tag_type.sync()
         self.object_ids = [tag_type['tag_type_id']]