From: Ansgar Burchardt <ansgar@debian.org>
Date: Mon, 26 May 2014 07:55:42 +0000 (+0200)
Subject: Merge remote-tracking branch 'helmut/fix-gpg_get_key_addresses'
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=40aec5c73f30123298678e2e396bf41ab20417c4;hp=5bf93e8c52febd744c56d72dbbb4edc0ccca0177;p=dak.git

Merge remote-tracking branch 'helmut/fix-gpg_get_key_addresses'
---

diff --git a/daklib/utils.py b/daklib/utils.py
index 30683097..3ae8d289 100644
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -1381,7 +1381,8 @@ def gpg_get_key_addresses(fingerprint):
             except IndexError:
                 continue
             try:
-                uid = codecs.decode(uid.decode("utf-8"), "unicode_escape")
+                # Do not use unicode_escape, because it is locale-specific
+                uid = codecs.decode(uid, "string_escape").decode("utf-8")
             except UnicodeDecodeError:
                 uid = uid.decode("latin1") # does not fail
             m = re_parse_maintainer.match(uid)