X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FPCUTypes.py;h=78a335363d3e870ab9cbf2120fdf97f69f29b46d;hb=79d959a7decd4af5b0b15e660bb3bd5bb5edfcaf;hp=0839f5b33fbfa76ed6416dd9043ddb0252c0a7a3;hpb=f7ce7ce813d4c44502629820a3583f32a99a98f7;p=plcapi.git diff --git a/PLC/PCUTypes.py b/PLC/PCUTypes.py index 0839f5b..78a3353 100644 --- a/PLC/PCUTypes.py +++ b/PLC/PCUTypes.py @@ -4,9 +4,7 @@ # Mark Huang # Copyright (C) 2006 The Trustees of Princeton University # -# $Id$ -# $URL$ -# + from types import StringTypes from PLC.Faults import * @@ -77,10 +75,10 @@ class PCUTypes(Table): pcu_type_filter = Filter(PCUType.fields, pcu_type_filter) sql += " AND (%s) %s" % pcu_type_filter.sql(api, "AND") elif isinstance (pcu_type_filter, StringTypes): - pcu_type_filter = Filter(PCUType.fields, {'model':[pcu_type_filter]}) + pcu_type_filter = Filter(PCUType.fields, {'model':pcu_type_filter}) sql += " AND (%s) %s" % pcu_type_filter.sql(api, "AND") elif isinstance (pcu_type_filter, int): - pcu_type_filter = Filter(PCUType.fields, {'pcu_type_id':[pcu_type_filter]}) + pcu_type_filter = Filter(PCUType.fields, {'pcu_type_id':pcu_type_filter}) sql += " AND (%s) %s" % pcu_type_filter.sql(api, "AND") else: raise PLCInvalidArgument, "Wrong pcu_type filter %r"%pcu_type_filter