Yield utf-8 encoded strings from DBBinary.scan_contents().

[dak.git] / daklib / dbconn.py

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index c7ecdc189cb3125b132fb350fb4756193ce655ca..87db1a35fa1a0dda87bc5ee2237079854caae879 100755 (executable)
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -516,11 +516,13 @@ class DBBinary(ORMObject):
         tar = TarFile.open(fileobj = dpkg.stdout, mode = 'r|')
         for member in tar.getmembers():
             if member.isfile():
+                name = normpath(member.name)
+                # enforce proper utf-8 encoding
                 try:
-                    name = member.name.decode('utf-8')
+                    name.decode('utf-8')
                 except UnicodeDecodeError:
-                    name = member.name.decode('iso8859-1')
-                yield normpath(name)
+                    name = name.decode('iso8859-1').encode('utf-8')
+                yield name
         tar.close()
         dpkg.stdout.close()
         dpkg.wait()
@@ -3312,7 +3314,7 @@ class DBConn(object):
             engine_args['pool_size'] = int(cnf['DB::PoolSize'])
         if cnf.has_key('DB::MaxOverflow'):
             engine_args['max_overflow'] = int(cnf['DB::MaxOverflow'])
-        if sa_major_version >= 0.6 and cnf.has_key('DB::Unicode') and \
+        if sa_major_version == '0.6' and cnf.has_key('DB::Unicode') and \
             cnf['DB::Unicode'] == 'false':
             engine_args['use_native_unicode'] = False