summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>2017-04-20 21:49:38 +0200
committerPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>2017-05-09 12:41:44 +0200
commitb23b1e10341d0dcae898dbb4d0e140c5d82f0512 (patch)
treeffec02035766411013a5c62d79fe2be14c5d26e6
parent0678e519c56f8b138ec5bb872fca667aa0b34987 (diff)
patman: a better fix for UTF-8?
-rw-r--r--tools/patman/series.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/tools/patman/series.py b/tools/patman/series.py
index 134a381ae3..661fb0b0c2 100644
--- a/tools/patman/series.py
+++ b/tools/patman/series.py
@@ -119,7 +119,7 @@ class Series(dict):
email = col.Color(col.YELLOW, "<alias '%s' not found>"
% tag)
if email:
- print(' Cc: ', email.encode('utf-8'))
+ print(' Cc: ', email)
print
for item in to_set:
print('To:\t ', item)
@@ -229,14 +229,16 @@ class Series(dict):
raise_on_error=raise_on_error)
if add_maintainers:
list += get_maintainer.GetMaintainer(commit.patch)
+ list = [s.encode('utf-8') for s in list]
all_ccs += list
- print(commit.patch, ', '.join(set(list)).encode('utf-8'), file=fd)
+ print(commit.patch, ', '.join(set(list)), file=fd)
self._generated_cc[commit.patch] = list
if cover_fname:
cover_cc = gitutil.BuildEmailList(self.get('cover_cc', ''))
- cc_list = ', '.join([x.decode('utf-8') for x in set(cover_cc + all_ccs)])
- print(cover_fname, cc_list.encode('utf-8'), file=fd)
+ cover_cc = [s.encode('utf-8') for s in cover_cc]
+ cc_list = ', '.join([x for x in set(cover_cc + all_ccs)])
+ print(cover_fname, cc_list, file=fd)
fd.close()
return fname