X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FAddresses.py;h=6d6aceeb1a6eac8521590c7675320a30002acd82;hb=refs%2Fheads%2Fremove-xmlrpc;hp=14bc9db8fa93682d725a88aca760ef1cf300803f;hpb=0c8ba37cf3c0037bfdb401db49bcd631a287c894;p=plcapi.git

diff --git a/PLC/Addresses.py b/PLC/Addresses.py
index 14bc9db..6d6acee 100644
--- a/PLC/Addresses.py
+++ b/PLC/Addresses.py
@@ -83,17 +83,17 @@ class Addresses(Table):
     database.
     """
 
-    def __init__(self, api, address_filter = None):
-	Table.__init__(self, api, Address)
+    def __init__(self, api, address_filter = None, columns = None):
+        Table.__init__(self, api, Address, columns)
 
         sql = "SELECT %s FROM view_addresses WHERE True" % \
-              ", ".join(Address.fields)
+              ", ".join(self.columns)
 
         if address_filter is not None:
-            if isinstance(address_filter, list):
+            if isinstance(address_filter, (list, tuple, set, int, long)):
                 address_filter = Filter(Address.fields, {'address_id': address_filter})
             elif isinstance(address_filter, dict):
                 address_filter = Filter(Address.fields, address_filter)
-            sql += " AND (%s)" % address_filter.sql(api)
+            sql += " AND (%s) %s" % address_filter.sql(api)
 
         self.selectall(sql)