blind 2to3

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

diff --git a/PLC/Methods/SetPersonPrimarySite.py b/PLC/Methods/SetPersonPrimarySite.py
index 61ab287..9fcb2ec 100644 (file)
--- a/PLC/Methods/SetPersonPrimarySite.py
+++ b/PLC/Methods/SetPersonPrimarySite.py
@@ -10,7 +10,7 @@ class SetPersonPrimarySite(Method):
     Makes the specified site the person's primary site. The person
     must already be a member of the site.
 
-    ins may update anyone. All others may only update themselves.
+    Admins may update anyone. All others may only update themselves.
     """
 
     roles = ['admin', 'pi', 'user', 'tech']
@@ -25,31 +25,37 @@ class SetPersonPrimarySite(Method):
 
     returns = Parameter(int, '1 if successful')
 
+    object_type = 'Person'
+
     def call(self, auth, person_id_or_email, site_id_or_login_base):
         # 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")
+
         # Authenticated function
         assert self.caller is not None
 
         # Non-admins can only update their own primary site
         if 'admin' not in self.caller['roles'] and \
            self.caller['person_id'] != person['person_id']:
-            raise PLCPermissionDenied, "Not allowed to update specified account"
+            raise PLCPermissionDenied("Not allowed to update specified account")
 
         # Get site information
         sites = Sites(self.api, [site_id_or_login_base])
         if not sites:
-            raise PLCInvalidArgument, "No such site"
-
+            raise PLCInvalidArgument("No such site")
         site = sites[0]
 
+        if site['peer_id'] is not None:
+            raise PLCInvalidArgument("Not a local site")
+
         if site['site_id'] not in person['site_ids']:
-            raise PLCInvalidArgument, "Not a member of the specified site"
+            raise PLCInvalidArgument("Not a member of the specified site")
 
         person.set_primary_site(site)