group db-related stuff in sfa/storage

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

diff --git a/sfa/util/filter.py b/sfa/storage/filter.py
similarity index 98%
rename from sfa/util/filter.py
rename to sfa/storage/filter.py
index 8f037ca..afe425d 100644 (file)
--- a/sfa/util/filter.py
+++ b/sfa/storage/filter.py
@@ -1,16 +1,9 @@
 from types import StringTypes
-try:
-    set
-except NameError:
-    from sets import Set
-    set = Set
-
-try: import pgdb
-except: pass
+import pgdb
  
 from sfa.util.faults import SfaInvalidArgument
-from sfa.util.parameter import Parameter, Mixed, python_type
 
+from sfa.storage.parameter import Parameter, Mixed, python_type
 
 class Filter(Parameter, dict):
     """