merged from onelab newplc-4.0.13 tag

[plcapi.git] / PLC / AddressTypes.py

diff --git a/PLC/AddressTypes.py b/PLC/AddressTypes.py
index 19f9b16..0effbe2 100644 (file)
--- a/PLC/AddressTypes.py
+++ b/PLC/AddressTypes.py
@@ -58,9 +58,9 @@ class AddressTypes(Table):
                 ints = filter(lambda x: isinstance(x, (int, long)), address_type_filter)
                 strs = filter(lambda x: isinstance(x, StringTypes), address_type_filter)
                 address_type_filter = Filter(AddressType.fields, {'address_type_id': ints, 'name': strs})
-                sql += " AND (%s)" % address_type_filter.sql(api, "OR")
+                sql += " AND (%s) %s" % address_type_filter.sql(api, "OR")
             elif isinstance(address_type_filter, dict):
                 address_type_filter = Filter(AddressType.fields, address_type_filter)
-                sql += " AND (%s)" % address_type_filter.sql(api, "AND")
+                sql += " AND (%s) %s" % address_type_filter.sql(api, "AND")
 
         self.selectall(sql)