X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FAddresses.py;h=c4772b4349040edbd8f1ccfc8a031b650f10f868;hb=dcc6f482920ecb0762646729200323408cce436f;hp=62f9e3bd3dddad66476814936f6f01373a5ad22f;hpb=e347fc823bbba9d88a3fddf07d5c21024dfd1e55;p=plcapi.git

diff --git a/PLC/Addresses.py b/PLC/Addresses.py
index 62f9e3b..c4772b4 100644
--- a/PLC/Addresses.py
+++ b/PLC/Addresses.py
@@ -1,3 +1,6 @@
+# $Id$
+# $URL$
+
 from PLC.Faults import *
 from PLC.Parameter import Parameter
 from PLC.Table import Row, Table
@@ -84,16 +87,16 @@ class Addresses(Table):
     """
 
     def __init__(self, api, address_filter = None, columns = None):
-	Table.__init__(self, api, Address, columns)
+        Table.__init__(self, api, Address, columns)
 
         sql = "SELECT %s FROM view_addresses WHERE True" % \
               ", ".join(self.columns)
 
         if address_filter is not None:
-            if isinstance(address_filter, (list, tuple, set)):
+            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)