Ticket #2905: another_2905_fix.diff

trac/ticket/report.py

@@ -385 +385 @@
 
         # FIXME: fetchall should probably not be used.
         info = cursor.fetchall() or []
-        cols = cursor.description or []
+        cols = cursor.describe() or []
 
         db.rollback()
 

trac/db/sqlite_backend.py

@@ -43 +43 @@
             return self._rollback_on_error(sqlite.Cursor.executemany, sql,
                                            args or [])
 
+        def describe(self):
+            return [(unicode(d[0], 'utf-8'),) + (None,)*6
+                    for d in list(self.description)]
+        
 except ImportError:
     try:
         import sqlite

trac/web/clearsilver.py

@@ -207 +207 @@
         Add data to the HDF dataset.
         """
         def set_unicode(prefix, value):
-            self.hdf.setValue(prefix, value.encode('utf-8'))
+            self.hdf.setValue(prefix.encode('utf-8'), value.encode('utf-8'))
         def set_str(prefix, value):
-            self.hdf.setValue(prefix, str(value))
+            self.hdf.setValue(prefix.encode('utf-8'), str(value))
             
         def add_value(prefix, value):
             if value is None: