/etc/plc.d/db dump-and-clean

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

diff --git a/PLC/Methods/AddRoleToPerson.py b/PLC/Methods/AddRoleToPerson.py
index 4cc08f2..4f275af 100644 (file)
--- a/PLC/Methods/AddRoleToPerson.py
+++ b/PLC/Methods/AddRoleToPerson.py
@@ -1,4 +1,3 @@
-# $Id$
 from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
@@ -9,7 +8,7 @@ from PLC.Roles import Role, Roles
 class AddRoleToPerson(Method):
     """
     Grants the specified role to the person.
-    
+
     PIs can only grant the tech and user roles to users and techs at
     their sites. Admins can grant any role to any user.
 
@@ -32,36 +31,36 @@ class AddRoleToPerson(Method):
         # Get role
         roles = Roles(self.api, [role_id_or_name])
         if not roles:
-            raise PLCInvalidArgument, "Invalid role '%s'" % unicode(role_id_or_name)
+            raise PLCInvalidArgument("Invalid role '%s'" % str(role_id_or_name))
         role = roles[0]
 
         # Get account information
         persons = Persons(self.api, [person_id_or_email])
         if not persons:
-            raise PLCInvalidArgument, "No such account"
+            raise PLCInvalidArgument("No such account")
         person = persons[0]
 
         if person['peer_id'] is not None:
-            raise PLCInvalidArgument, "Not a local account"
+            raise PLCInvalidArgument("Not a local account")
 
         # Authenticated function
         assert self.caller is not None
 
         # Check if we can update this account
         if not self.caller.can_update(person):
-            raise PLCPermissionDenied, "Not allowed to update specified account"
+            raise PLCPermissionDenied("Not allowed to update specified account")
 
         # Can only grant lesser (higher) roles to others
         if 'admin' not in self.caller['roles'] and \
            role['role_id'] <= min(self.caller['role_ids']):
-            raise PLCInvalidArgument, "Not allowed to grant that role"
+            raise PLCInvalidArgument("Not allowed to grant that role")
 
         if role['role_id'] not in person['role_ids']:
             person.add_role(role)
 
-       self.event_objects = {'Person': [person['person_id']],
-                             'Role': [role['role_id']]}
-       self.message = "Role %d granted to person %d" % \
+        self.event_objects = {'Person': [person['person_id']],
+                              'Role': [role['role_id']]}
+        self.message = "Role %d granted to person %d" % \
                        (role['role_id'], person['person_id'])
 
         return 1