X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FPCUs.py;h=d628677bb71dac5f754bcad69b786716d3f58862;hb=79d959a7decd4af5b0b15e660bb3bd5bb5edfcaf;hp=98d5be3aa6e319c565c89ded51abbff8912ff026;hpb=5d8a25ab329d0c44d34645b0ddeacba2f02331eb;p=plcapi.git diff --git a/PLC/PCUs.py b/PLC/PCUs.py index 98d5be3..d628677 100644 --- a/PLC/PCUs.py +++ b/PLC/PCUs.py @@ -4,9 +4,6 @@ # Mark Huang # Copyright (C) 2006 The Trustees of Princeton University # -# $Id$ -# $URL$ -# from PLC.Faults import * from PLC.Parameter import Parameter @@ -126,10 +123,12 @@ class PCUs(Table): ", ".join(self.columns) if pcu_filter is not None: - if isinstance(pcu_filter, (list, tuple, set)): + if isinstance(pcu_filter, (list, tuple, set, int, long)): pcu_filter = Filter(PCU.fields, {'pcu_id': pcu_filter}) elif isinstance(pcu_filter, dict): pcu_filter = Filter(PCU.fields, pcu_filter) + else: + raise PLCInvalidArgument, "Wrong pcu filter %r"%pcu_filter sql += " AND (%s) %s" % pcu_filter.sql(api) self.selectall(sql)