chore: make apply_all_patches.py work in both python2 and python3 (#19872)
This commit is contained in:
parent
81e9dab52f
commit
ef6d4a46c2
3 changed files with 4 additions and 3 deletions
|
@ -11,7 +11,7 @@ from lib.patches import patch_from_dir
|
||||||
|
|
||||||
def apply_patches(dirs):
|
def apply_patches(dirs):
|
||||||
threeway = os.environ.get("ELECTRON_USE_THREE_WAY_MERGE_FOR_PATCHES")
|
threeway = os.environ.get("ELECTRON_USE_THREE_WAY_MERGE_FOR_PATCHES")
|
||||||
for patch_dir, repo in dirs.iteritems():
|
for patch_dir, repo in dirs.items():
|
||||||
git.import_patches(repo=repo, patch_data=patch_from_dir(patch_dir),
|
git.import_patches(repo=repo, patch_data=patch_from_dir(patch_dir),
|
||||||
threeway=threeway is not None,
|
threeway=threeway is not None,
|
||||||
committer_name="Electron Scripts", committer_email="scripts@electron")
|
committer_name="Electron Scripts", committer_email="scripts@electron")
|
||||||
|
|
|
@ -61,7 +61,7 @@ def am(repo, patch_data, threeway=False, directory=None, exclude=None,
|
||||||
proc = subprocess.Popen(
|
proc = subprocess.Popen(
|
||||||
command,
|
command,
|
||||||
stdin=subprocess.PIPE)
|
stdin=subprocess.PIPE)
|
||||||
proc.communicate(patch_data)
|
proc.communicate(patch_data.encode('utf-8'))
|
||||||
if proc.returncode != 0:
|
if proc.returncode != 0:
|
||||||
raise RuntimeError("Command {} returned {}".format(command,
|
raise RuntimeError("Command {} returned {}".format(command,
|
||||||
proc.returncode))
|
proc.returncode))
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
|
|
||||||
|
import codecs
|
||||||
import os
|
import os
|
||||||
|
|
||||||
|
|
||||||
|
@ -7,7 +8,7 @@ def read_patch(patch_dir, patch_filename):
|
||||||
"""Read a patch from |patch_dir/filename| and amend the commit message with
|
"""Read a patch from |patch_dir/filename| and amend the commit message with
|
||||||
metadata about the patch file it came from."""
|
metadata about the patch file it came from."""
|
||||||
ret = []
|
ret = []
|
||||||
with open(os.path.join(patch_dir, patch_filename)) as f:
|
with codecs.open(os.path.join(patch_dir, patch_filename), encoding='utf-8') as f:
|
||||||
for l in f.readlines():
|
for l in f.readlines():
|
||||||
if l.startswith('diff -'):
|
if l.startswith('diff -'):
|
||||||
ret.append('Patch-Filename: {}\n'.format(patch_filename))
|
ret.append('Patch-Filename: {}\n'.format(patch_filename))
|
||||||
|
|
Loading…
Reference in a new issue