X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FConfFiles.py;h=32a1b54ea6e137c0648c5352a758fbcee8c5422e;hb=19d4a01ccf66af9e00914351b3eacd5fc880f988;hp=dbd46f38d3a82ea8ed2e32a5e02db7ea0a0d6cdb;hpb=4604006f235246d8480da96e488c0c7fd6a09c91;p=plcapi.git diff --git a/PLC/ConfFiles.py b/PLC/ConfFiles.py index dbd46f3..32a1b54 100644 --- a/PLC/ConfFiles.py +++ b/PLC/ConfFiles.py @@ -4,8 +4,6 @@ # Mark Huang # Copyright (C) 2006 The Trustees of Princeton University # -# $Id: ConfFiles.py,v 1.9 2006/11/09 03:07:42 mlhuang Exp $ -# from PLC.Faults import * from PLC.Parameter import Parameter @@ -140,13 +138,13 @@ class ConfFiles(Table): """ def __init__(self, api, conf_file_filter = None, columns = None): - Table.__init__(self, api, ConfFile, columns) + Table.__init__(self, api, ConfFile, columns) sql = "SELECT %s FROM view_conf_files WHERE True" % \ ", ".join(self.columns) if conf_file_filter is not None: - if isinstance(conf_file_filter, (list, tuple, set)): + if isinstance(conf_file_filter, (list, tuple, set, int, long)): conf_file_filter = Filter(ConfFile.fields, {'conf_file_id': conf_file_filter}) elif isinstance(conf_file_filter, dict): conf_file_filter = Filter(ConfFile.fields, conf_file_filter)