[U-Boot] [PATCH 20/21] patman: Tidy up a few more unicode conversions
Simon Glass
sjg at chromium.org
Tue May 14 21:53:54 UTC 2019
Use the new functions in the tools module to handle conversion.
Signed-off-by: Simon Glass <sjg at chromium.org>
---
tools/patman/gitutil.py | 4 +---
tools/patman/series.py | 5 ++---
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py
index fb9e67c0f0..dce7fa25b6 100644
--- a/tools/patman/gitutil.py
+++ b/tools/patman/gitutil.py
@@ -412,9 +412,7 @@ def EmailPatches(series, cover_fname, args, dry_run, raise_on_error, cc_fname,
if smtp_server:
cmd.append('--smtp-server=%s' % smtp_server)
if in_reply_to:
- if type(in_reply_to) != str:
- in_reply_to = in_reply_to.encode('utf-8')
- cmd.append('--in-reply-to="%s"' % in_reply_to)
+ cmd.append('--in-reply-to="%s"' % tools.FromUnicode(in_reply_to))
if thread:
cmd.append('--thread')
diff --git a/tools/patman/series.py b/tools/patman/series.py
index bbb30d849e..67103f03e6 100644
--- a/tools/patman/series.py
+++ b/tools/patman/series.py
@@ -239,7 +239,7 @@ class Series(dict):
for x in set(cc) & set(settings.bounces):
print(col.Color(col.YELLOW, 'Skipping "%s"' % x))
cc = set(cc) - set(settings.bounces)
- cc = [m.encode('utf-8') if type(m) != str else m for m in cc]
+ cc = [tools.FromUnicode(m) for m in cc]
if limit is not None:
cc = cc[:limit]
all_ccs += cc
@@ -248,8 +248,7 @@ class Series(dict):
if cover_fname:
cover_cc = gitutil.BuildEmailList(self.get('cover_cc', ''))
- cover_cc = [m.encode('utf-8') if type(m) != str else m
- for m in cover_cc]
+ cover_cc = [tools.FromUnicode(m) for m in cover_cc]
cc_list = ', '.join([tools.ToUnicode(x)
for x in sorted(set(cover_cc + all_ccs))])
print(cover_fname, cc_list.encode('utf-8'), file=fd)
--
2.21.0.1020.gf2820cf01a-goog
More information about the U-Boot
mailing list