(*) slice atttribute types get cached

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

diff --git a/PLC/Methods/AddAddressTypeToAddress.py b/PLC/Methods/AddAddressTypeToAddress.py
index 1a20e0e..5f4d1c1 100644 (file)
--- a/PLC/Methods/AddAddressTypeToAddress.py
+++ b/PLC/Methods/AddAddressTypeToAddress.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.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 AddAddressTypeToAddress(Method):
     """
 
 class AddAddressTypeToAddress(Method):
     """


@@ -17,7 +17,7 @@ class AddAddressTypeToAddress(Method):
     roles = ['admin', 'pi']
 
     accepts = [
     roles = ['admin', 'pi']
 
     accepts = [

-        PasswordAuth(),
+        Auth(),

         Mixed(AddressType.fields['address_type_id'],
               AddressType.fields['name']),
         Address.fields['address_id']
         Mixed(AddressType.fields['address_type_id'],
               AddressType.fields['name']),
         Address.fields['address_id']


@@ -27,15 +27,14 @@ class AddAddressTypeToAddress(Method):
 
     event_type = 'AddTo'
     object_type = 'Address'
 
     event_type = 'AddTo'
     object_type = 'Address'

-    object_ids = []

 
     def call(self, auth, address_type_id_or_name, address_id):
 
     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"
         address_type = address_types[0]
 
         if not address_types:
             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"
         address = addresses[0]
         if not addresses:
             raise PLCInvalidArgument, "No such address"
         address = addresses[0]