X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FFilter.py;h=d3a17b4e105cdd33208a087ddedac1787fbc3a23;hb=e70e20fdbececafef842ec7b330fd48db42e614e;hp=fe00c2bd6e2e834f280230fa66ea86b661c34bc0;hpb=fce6d4f0d14af7bd41d534d942b6f6e293b89b24;p=plcapi.git diff --git a/PLC/Filter.py b/PLC/Filter.py index fe00c2b..d3a17b4 100644 --- a/PLC/Filter.py +++ b/PLC/Filter.py @@ -2,16 +2,11 @@ # Thierry Parmentelat - INRIA # from types import StringTypes -try: - set -except NameError: - from sets import Set - set = Set - import time from PLC.Faults import * from PLC.Parameter import Parameter, Mixed, python_type +from PLC.Logger import logger class Filter(Parameter, dict): """ @@ -271,5 +266,7 @@ class Filter(Parameter, dict): clip_part += " ORDER BY " + ",".join(sorts) if clips: clip_part += " " + " ".join(clips) - if Filter.debug: print 'Filter.sql: where_part=',where_part,'clip_part',clip_part - return (where_part,clip_part) + if Filter.debug: + logger.debug('Filter.sql: where_part={} - clip_part={}' + .format(where_part, clip_part)) + return where_part, clip_part