- testlib: make a copy of initial list in assertEquals

- db: bytea conversion for sqlite

2 files changed, 15 insertions, 6 deletions

diff --git a/db.py b/db.py
index d1cae67..0aa0ac1 100644
--- a/db.py
+++ b/db.py
@@ -237,6 +237,7 @@ class _PySqlite2Adapter(DBAPIAdapter):
             return
 
         from mx.DateTime import DateTimeType, strptime
+        from StringIO import StringIO
 
         def adapt_mxdatetime(mxd):
             return mxd.strftime('%F %H:%M:%S')
@@ -250,6 +251,14 @@ class _PySqlite2Adapter(DBAPIAdapter):
             return strptime(ustr, '%F %H:%M:%S')
         sqlite.register_converter('timestamp', convert_mxdatetime)
 
+        def adapt_bytea(data):
+            return data.getvalue()
+        sqlite.register_adapter(StringIO, adapt_bytea)
+
+        def convert_bytea(data):
+            return StringIO(data)
+        sqlite.register_converter('bytea', convert_bytea)
+
         def convert_boolean(ustr):
             if ustr.lower() == 'false':
                 return False
diff --git a/testlib.py b/testlib.py
index 4580438..40a345b 100644
--- a/testlib.py
+++ b/testlib.py
@@ -466,17 +466,17 @@ class TestCase(unittest.TestCase):
         If the two list differ, the first difference is shown in the error
         message
         """
-        l1 = l1[:]
+        _l1 = l1[:]
         for i, value in enumerate(l2):
             try:
-                if l1[0] != value:
-                    self.fail('%r != %r for index %d' % (l1[0], value, i))
-                del l1[0]
+                if _l1[0] != value:
+                    self.fail('%r != %r for index %d' % (_l1[0], value, i))
+                del _l1[0]
             except IndexError:
                 msg = 'l1 has only %d elements, not %s (at least %r missing)'
                 self.fail(msg % (i, len(l2), value))
-        if l1:
-            self.fail('l2 is lacking %r' % l1)
+        if _l1:
+            self.fail('l2 is lacking %r' % _l1)
     assertListEqual = assertListEquals
     
     def assertLinesEquals(self, l1, l2):