dabo Commit
Revision 2574
Date: 2006-12-21 10:55:15 -0800 (Thu, 21 Dec 2006)
Author: Ed

Changed:
U   trunk/dabo/db/dCursorMixin.py

Log:
Removed unnecessary blob handling code.

Improved the encoding for non-ascii values.


Diff:
Modified: trunk/dabo/db/dCursorMixin.py
===================================================================
--- trunk/dabo/db/dCursorMixin.py       2006-12-21 16:17:31 UTC (rev 2573)
+++ trunk/dabo/db/dCursorMixin.py       2006-12-21 18:55:15 UTC (rev 2574)
@@ -193,9 +193,9 @@
                                                        break
                                else:
                                        raise UnicodeDecodeError, e
-               elif isinstance(field_val, array.array):
-                       # Usually blob data
-                       ret = val.tostring()
+#              elif isinstance(field_val, array.array):
+#                      # Usually blob data
+#                      ret = field_val.tostring()
 
                return ret
 
@@ -210,13 +210,16 @@
                #### NOTE: NEEDS TO BE TESTED THOROUGHLY!!!!  ####
 
                # Some backends, notably Firebird, require that fields be 
specially marked.
+               if not isinstance(sql, unicode):
+                       sql = unicode(sql, self.Encoding)
                sql = self.processFields(sql)
                
                # Make sure all Unicode characters are properly encoded.
-               if isinstance(sql, unicode):
-                       sqlEX = sql.encode(self.Encoding)
-               else:
-                       sqlEX = sql
+#              if isinstance(sql, unicode):
+#                      sqlEX = sql.encode(self.Encoding)
+#              else:
+#                      sqlEX = sql
+               sqlEX = sql
                
                try:
                        if params is None or len(params) == 0:




_______________________________________________
Post Messages to: [email protected]
Subscription Maintenance: http://leafe.com/mailman/listinfo/dabo-dev

Reply via email to