use pprint.PrettyPrinter intead of pprint.pformat

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

diff --git a/sfa/storage/filter.py b/sfa/storage/filter.py
index afe425d..1a710f6 100644 (file)
--- a/sfa/storage/filter.py
+++ b/sfa/storage/filter.py
@@ -1,8 +1,7 @@
-from types import StringTypes
-import pgdb
+import types
+import datetime
  
 from sfa.util.faults import SfaInvalidArgument
-
 from sfa.storage.parameter import Parameter, Mixed, python_type
 
 class Filter(Parameter, dict):
@@ -88,8 +87,32 @@ class Filter(Parameter, dict):
         # quoting, except for array types.
         if isinstance(value, (list, tuple, set)):
             return "ARRAY[%s]" % ", ".join(map(self.quote, value))
+
         else:
-            return pgdb._quote(value)    
+            return Filter._quote(value)    
+
+    # pgdb._quote isn't supported in python 2.7/f16, so let's implement it here
+    @staticmethod   
+    def _quote(x):
+        if isinstance(x, datetime.datetime):
+                x = str(x)
+        elif isinstance(x, unicode):
+                x = x.encode( 'utf-8' )
+
+        if isinstance(x, types.StringType):
+                x = "'%s'" % str(x).replace("\\", "\\\\").replace("'", "''")
+        elif isinstance(x, (types.IntType, types.LongType, types.FloatType)):
+                pass
+        elif x is None:
+                x = 'NULL'
+        elif isinstance(x, (types.ListType, types.TupleType)):
+                x = '(%s)' % ','.join(map(lambda x: str(_quote(x)), x))
+        elif hasattr(x, '__pg_repr__'):
+                x = x.__pg_repr__()
+        else:
+                raise TypeError, 'do not know how to handle type %s' % type(x)
+
+        return x
 
     def sql(self, join_with = "AND"):
         """
@@ -146,7 +169,7 @@ class Filter(Parameter, dict):
                     if value is None:
                         operator = "IS"
                         value = "NULL"
-                    elif isinstance(value, StringTypes) and \
+                    elif isinstance(value, types.StringTypes) and \
                             (value.find("*") > -1 or value.find("%") > -1):
                         operator = "LIKE"
                         # insert *** in pattern instead of either * or %