commit 8a6e1120914dd3da9e386996761a7a5729b2cff7
author Douglas Anderson <dianders@chromium.org> Mon Jul 02 16:03:53 2018 -0700
committer chrome-bot <chrome-bot@chromium.org> Tue Jul 03 11:41:09 2018 -0700
tree ba50ed9fb53ab7c2ed56636519538cf00f6311c2
parent 52f7cd0f10487f6e57498698324950dc1ff44c7d

contrib: fromupstream: Fix unicode handling

It appears that the data coming from pwclient is already UTF-8, so we
shouldn't be assuming it's ASCII and then converting it to UTF-8.

BUG=None
TEST=fromupstream.py -b= -t= pw://10502209

Change-Id: I9ec49551b691c353174d8f8c2f14fdc2e8741ce6
Reviewed-on: https://chromium-review.googlesource.com/1123639
Commit-Ready: Douglas Anderson <dianders@chromium.org>
Tested-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Alexandru M Stan <amstan@chromium.org>

contrib/fromupstream.py

diff --git a/contrib/fromupstream.py b/contrib/fromupstream.py
index f74a7de..8949eb5 100755
--- a/contrib/fromupstream.py
+++ b/contrib/fromupstream.py
@@ -195,7 +195,7 @@
                 sys.stderr.write('Error: No patch content found\n')
                 sys.exit(1)
             git_am = subprocess.Popen(['git', 'am', '-3'], stdin=subprocess.PIPE)
-            git_am.communicate(unicode(s).encode('utf-8'))
+            git_am.communicate(s)
             ret = git_am.returncode
         elif linux_match:
             commit = linux_match.group(1)