blind 2to3

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

diff --git a/PLC/Methods/DeleteAddressTypeFromAddress.py b/PLC/Methods/DeleteAddressTypeFromAddress.py
index 266a9ff..c9b95e4 100644 (file)
--- a/PLC/Methods/DeleteAddressTypeFromAddress.py
+++ b/PLC/Methods/DeleteAddressTypeFromAddress.py
@@ -3,7 +3,7 @@ from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.AddressTypes import AddressType, AddressTypes
 from PLC.Addresses import Address, Addresses
-from PLC.Auth import PasswordAuth
+from PLC.Auth import Auth
 
 class DeleteAddressTypeFromAddress(Method):
     """
@@ -17,7 +17,7 @@ class DeleteAddressTypeFromAddress(Method):
     roles = ['admin', 'pi']
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
         Mixed(AddressType.fields['address_type_id'],
               AddressType.fields['name']),
         Address.fields['address_id']
@@ -25,21 +25,24 @@ class DeleteAddressTypeFromAddress(Method):
 
     returns = Parameter(int, '1 if successful')
 
+
     def call(self, auth, address_type_id_or_name, address_id):
-        address_types = AddressTypes(self.api, [address_type_id_or_name]).values()
+        address_types = AddressTypes(self.api, [address_type_id_or_name])
         if not address_types:
-            raise PLCInvalidArgument, "No such address type"
+            raise PLCInvalidArgument("No such address type")
         address_type = address_types[0]
 
-        addresses = Addresses(self.api, [address_id]).values()
+        addresses = Addresses(self.api, [address_id])
         if not addresses:
-            raise PLCInvalidArgument, "No such address"
+            raise PLCInvalidArgument("No such address")
         address = addresses[0]
 
         if 'admin' not in self.caller['roles']:
             if address['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.remove_address_type(address_type)
+        self.event_objects = {'Address' : [address['address_id']],
+                              'AddressType': [address_type['address_type_id']]}
 
         return 1