git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- allow session key to be specified (for use on nodes)
[plcapi.git]
/
PLC
/
Addresses.py
diff --git
a/PLC/Addresses.py
b/PLC/Addresses.py
index
14bc9db
..
62f9e3b
100644
(file)
--- a/
PLC/Addresses.py
+++ b/
PLC/Addresses.py
@@
-83,14
+83,14
@@
class Addresses(Table):
database.
"""
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" % \
sql = "SELECT %s FROM view_addresses WHERE True" % \
- ", ".join(
Address.field
s)
+ ", ".join(
self.column
s)
if address_filter is not None:
if address_filter is not None:
- if isinstance(address_filter,
list
):
+ if isinstance(address_filter,
(list, tuple, set)
):
address_filter = Filter(Address.fields, {'address_id': address_filter})
elif isinstance(address_filter, dict):
address_filter = Filter(Address.fields, address_filter)
address_filter = Filter(Address.fields, {'address_id': address_filter})
elif isinstance(address_filter, dict):
address_filter = Filter(Address.fields, address_filter)