Changeset 3533

Timestamp:

04/19/10 13:28:06 (15 years ago)

Author:

jerome

Message:

Fixes #61. References #56, #60.

Location:

pykota/trunk/pykota

Files:

• dumper.py (modified) (2 diffs)
• storages/sqlitestorage.py (modified) (1 diff)
• version.py (modified) (1 diff)

pykota/trunk/pykota/dumper.py

@@ -248 +248 @@
                     try :
                         strvalue = '"%s"' % value.encode(self.charset, \
-                                                         "replace").replace(separator, "\\%s" % separator).replace('"', '\\"')
+                                                         "replace").replace(separator,
+                                                                            "\\%s" % separator).replace('"', '\\"')
                     except AttributeError :
                         if value is None :
@@ -331 +332 @@
                     # with older releases of PyKota.
                     # The XML dump will contain UTF-8 encoded strings,
-                    #�not unicode strings anyway.
+                    # not unicode strings anyway.
                     x.attribute(strvalue, \
                                 type=type(value).__name__.replace("unicode", "str"), \

pykota/trunk/pykota/storages/sqlitestorage.py

@@ -127 +127 @@
         if result :
             entries = [tuple([f[0] for f in self.cursor.description])]
-            for entry in result :
-                row = []
-                for value in entry :
-                    try :
-                        value = value.encode("UTF-8")
-                    except :
-                        pass
-                    row.append(value)
-                entries.append(tuple(row))
+            entries.extend(result)
             return entries
 

pykota/trunk/pykota/version.py

@@ -24 +24 @@
 import time
 
-__version__ = "1.27alpha9_unofficial"
+__version__ = "1.27alpha10_unofficial"
 
 __doc__ = "PyKota : a complete Printing Quota Solution for CUPS."