patcher: Add Python 3 support (see issue #2856)

This commit is contained in:
Marshall Greenblatt
2020-01-09 16:42:00 +02:00
parent 503ec7c2e6
commit 16e8710a81
4 changed files with 25 additions and 12 deletions

View File

@ -2,6 +2,7 @@
# reserved. Use of this source code is governed by a BSD-style license that
# can be found in the LICENSE file
from __future__ import absolute_import
from exec_util import exec_cmd
import os
import sys
@ -130,7 +131,7 @@ def git_apply_patch_file(patch_path, patch_dir):
if sys.platform == 'win32':
# Convert the patch to Unix line endings. This is necessary to avoid
# whitespace errors with git apply.
patch_string = patch_string.replace('\r\n', '\n')
patch_string = patch_string.replace(b'\r\n', b'\n')
# Git apply fails silently if not run relative to a respository root.
if not is_checkout(patch_dir):