Merge branch 'upstreammaster'

[sfa.git] / sfa / util / filter.py

diff --git a/sfa/util/filter.py b/sfa/util/filter.py
index 2a3b895..8f037ca 100644 (file)
--- a/sfa/util/filter.py
+++ b/sfa/util/filter.py
@@ -1,5 +1,3 @@
-# $Id$
-# $URL$
 from types import StringTypes
 try:
     set
@@ -7,10 +5,10 @@ except NameError:
     from sets import Set
     set = Set
 
-import time
-import pgdb
+try: import pgdb
+except: pass
  
-from sfa.util.faults import *
+from sfa.util.faults import SfaInvalidArgument
 from sfa.util.parameter import Parameter, Mixed, python_type
 
 
@@ -129,7 +127,7 @@ class Filter(Parameter, dict):
 
            for char in modifiers.keys():
                if field[0] == char:
-                   modifiers[char]=True;
+                   modifiers[char]=True
                    field = field[1:]
                    break