# Copyright (C) 2006 The Trustees of Princeton University
#
-from types import StringTypes
-
from PLC.Faults import *
from PLC.Parameter import Parameter
from PLC.Table import Row, Table
if isinstance(pcu_type_filter, (list, tuple, set)):
# Separate the list into integers and strings
ints = [x for x in pcu_type_filter if isinstance(x, int)]
- strs = [x for x in pcu_type_filter if isinstance(x, StringTypes)]
+ strs = [x for x in pcu_type_filter if isinstance(x, str)]
pcu_type_filter = Filter(PCUType.fields, {'pcu_type_id': ints, 'model': strs})
sql += " AND (%s) %s" % pcu_type_filter.sql(api, "OR")
elif isinstance(pcu_type_filter, dict):
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):
+ elif isinstance (pcu_type_filter, str):
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):