From 071528093f794444068b0b09ddbf3d1778d5b894 Mon Sep 17 00:00:00 2001 From: sokcevic Date: Wed, 18 Aug 2021 00:06:34 +0000 Subject: [PATCH] =?UTF-8?q?=EF=BB=BFSupport=20UTF-8=20messages=20in=20git?= =?UTF-8?q?=20cl=20upload=20=F0=9F=AA=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: 1240760 Change-Id: Ib64cd9c9b8c901105f6317bd74b889daa457e4de Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3101520 Reviewed-by: Gavin Mak Commit-Queue: Josip Sokcevic --- gclient_utils.py | 4 ++-- git_cl.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gclient_utils.py b/gclient_utils.py index 4b858ceee..b645806e6 100644 --- a/gclient_utils.py +++ b/gclient_utils.py @@ -1097,13 +1097,13 @@ def RunEditor(content, git, git_editor=None): if '\r' in content: print( '!! Please remove \\r from your change description !!', file=sys.stderr) - fileobj = os.fdopen(file_handle, 'w') + fileobj = os.fdopen(file_handle, 'wb') # Still remove \r if present. content = re.sub('\r?\n', '\n', content) # Some editors complain when the file doesn't end in \n. if not content.endswith('\n'): content += '\n' - fileobj.write(content) + fileobj.write(content.encode('utf-8')) fileobj.close() try: diff --git a/git_cl.py b/git_cl.py index 3dd546ffe..a12483ac9 100755 --- a/git_cl.py +++ b/git_cl.py @@ -164,8 +164,8 @@ def DieWithError(message, change_desc=None): def SaveDescriptionBackup(change_desc): backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE) print('\nsaving CL description to %s\n' % backup_path) - with open(backup_path, 'w') as backup_file: - backup_file.write(change_desc.description) + with open(backup_path, 'wb') as backup_file: + backup_file.write(change_desc.description.encode('utf-8')) def GetNoGitPagerEnv():