trailing spaces in sql schema

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

diff --git a/PLC/Methods/AddSiteAddress.py b/PLC/Methods/AddSiteAddress.py
index 746cb0e..7a467e5 100644 (file)
--- a/PLC/Methods/AddSiteAddress.py
+++ b/PLC/Methods/AddSiteAddress.py
@@ -5,7 +5,7 @@ from PLC.Addresses import Address, Addresses
 from PLC.Auth import Auth
 from PLC.Sites import Site, Sites
 
-can_update = lambda (field, value): field in \
+can_update = lambda field_value: field_value[0] in \
              ['line1', 'line2', 'line3',
               'city', 'state', 'postalcode', 'country']
 
@@ -21,7 +21,7 @@ class AddSiteAddress(Method):
 
     roles = ['admin', 'pi']
 
-    address_fields = dict(filter(can_update, Address.fields.items()))
+    address_fields = dict(list(filter(can_update, list(Address.fields.items()))))
 
     accepts = [
         Auth(),
@@ -32,27 +32,27 @@ class AddSiteAddress(Method):
 
     returns = Parameter(int, 'New address_id (> 0) if successful')
 
-
     def call(self, auth, site_id_or_login_base, address_fields):
-        address_fields = dict(filter(can_update, address_fields.items()))
+        address_fields = dict(list(filter(can_update, list(address_fields.items()))))
 
         # Get associated site details
         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 'admin' not in self.caller['roles']:
             if site['site_id'] not in self.caller['site_ids']:
-                raise PLCPermissionDenied, "Address must be associated with one of your sites"
+                raise PLCPermissionDenied("Address must be associated with one of your sites")
 
         address = Address(self.api, address_fields)
         address.sync(commit = False)
         site.add_address(address, commit = True)
 
-       # Logging variables
-       self.object_ids = [site['site_id'], address['address_id']]
-       self.message = 'Address %d assigned to Site %d' % \
-               (address['address_id'], site['site_id'])
+        # Logging variables
+        self.event_objects = {'Site': [site['site_id']],
+                              'Address': [address['address_id']]}
+        self.message = 'Address %d assigned to Site %d' % \
+                (address['address_id'], site['site_id'])
 
         return address['address_id']