From 21caa558ca1811a9995ed1c1b0e2c01cbdf25662 Mon Sep 17 00:00:00 2001 From: Philipp Tomsich Date: Mon, 29 May 2017 15:31:22 -0600 Subject: [PATCH] patman: encode CC list to UTF-8 This change encodes the CC list to UTF-8 to avoid failures on maintainer-addresses that include non-ASCII characters (observed on Debian 7.11 with Python 2.7.3). Without this, I get the following failure: Traceback (most recent call last): File "tools/patman/patman", line 159, in options.add_maintainers) File "[snip]/u-boot/tools/patman/series.py", line 234, in MakeCcFile print(commit.patch, ', '.join(set(list)), file=fd) UnicodeEncodeError: 'ascii' codec can't encode character u'\xfc' in position 81: ordinal not in range(128) from Heiko's email address: [..., u'"Heiko St\xfcbner" ', ...] While with this change added this encodes to: "=?UTF-8?q?Heiko=20St=C3=BCbner?= " Signed-off-by: Philipp Tomsich Reviewed-by: Simon Glass Signed-off-by: Simon Glass Tested-by: Simon Glass Tested-by: Philipp Tomsich --- tools/patman/series.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/patman/series.py b/tools/patman/series.py index c1b86521aa..134a381ae3 100644 --- a/tools/patman/series.py +++ b/tools/patman/series.py @@ -119,7 +119,7 @@ class Series(dict): email = col.Color(col.YELLOW, "" % tag) if email: - print(' Cc: ', email) + print(' Cc: ', email.encode('utf-8')) print for item in to_set: print('To:\t ', item) @@ -230,7 +230,7 @@ class Series(dict): if add_maintainers: list += get_maintainer.GetMaintainer(commit.patch) all_ccs += list - print(commit.patch, ', '.join(set(list)), file=fd) + print(commit.patch, ', '.join(set(list)).encode('utf-8'), file=fd) self._generated_cc[commit.patch] = list if cover_fname: -- 2.39.5