X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FDeletePersonFromSite.py;h=11df6a758e74b3596cb2a7d0cf55013c0db2eb71;hb=c3fc031363ac794e6b1245c6ed1a05329cba69c9;hp=b497463752aa5e888982c34d79a387a8418be2e6;hpb=dd6f6871abdf5412d908dc31777ce88b09192efe;p=plcapi.git

diff --git a/PLC/Methods/DeletePersonFromSite.py b/PLC/Methods/DeletePersonFromSite.py
index b497463..11df6a7 100644
--- a/PLC/Methods/DeletePersonFromSite.py
+++ b/PLC/Methods/DeletePersonFromSite.py
@@ -25,29 +25,33 @@ class DeletePersonFromSite(Method):
         ]
 
     returns = Parameter(int, '1 if successful')
-    
 
     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")
+
         # 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]
-	PLCCheckLocalSite(site,"DeletePersonFromSite")
+
+        if site['peer_id'] is not None:
+            raise PLCInvalidArgument("Not a local site")
 
         if site['site_id'] in person['site_ids']:
             site.remove_person(person)
 
-	# Logging variables
-	self.object_ids = [site['site_id']]
-	self.message = 'Person %d deleted from site %d	' % \
-		(person['person_id'], site['site_id'])
+        # Logging variables
+        self.event_objects = {'Site': [site['site_id']],
+                              'Person': [person['person_id']]}
+        self.message = 'Person %d deleted from site %d  ' % \
+                        (person['person_id'], site['site_id'])
+
         return 1