[dak/master 2/2] Yield utf-8 encoded strings from DBBinary.scan_contents().
Signed-off-by: Torsten Werner <twerner@debian.org>
---
daklib/dbconn.py | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 5bff418..87db1a3 100755
--- 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()
--
1.7.2.3
Reply to: