bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Marshall Greenblatt 2020-01-09 17:08:24 +02:00
parent 16e8710a81
commit 5792cea985
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/exec_util.py
View File

@ -38,4 +38,4 @@ def exec_cmd(cmd, path, input_string=None):
raise raise
except: except:
raise raise
return {'out': out.decode(), 'err': err.decode(), 'ret': ret} return {'out': out.decode('utf-8'), 'err': err.decode('utf-8'), 'ret': ret}

29
tools/patch_updater.py
View File

@ -2,6 +2,9 @@
# reserved. Use of this source code is governed by a BSD-style license that # reserved. Use of this source code is governed by a BSD-style license that
# can be found in the LICENSE file. # can be found in the LICENSE file.
from __future__ import absolute_import
from __future__ import print_function
from io import open
from optparse import Option, OptionParser, OptionValueError from optparse import Option, OptionParser, OptionValueError
import os import os
import re import re
@ -33,14 +36,14 @@ def warn(message):
def extract_paths(file): def extract_paths(file):
""" Extract the list of modified paths from the patch file. """ """ Extract the list of modified paths from the patch file. """
paths = [] paths = []
fp = open(file) with open(file, 'r', encoding='utf-8') as fp:
for line in fp: for line in fp:
if line[:4] != '+++ ': if line[:4] != '+++ ':
continue continue
match = re.match('^([^\t]+)', line[4:]) match = re.match('^([^\t]+)', line[4:])
if not match: if not match:
continue continue
paths.append(match.group(1).strip()) paths.append(match.group(1).strip())
return paths return paths
@ -119,12 +122,12 @@ parser.add_option(
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
if options.resave and options.revert: if options.resave and options.revert:
print 'Invalid combination of options.' print('Invalid combination of options.')
parser.print_help(sys.stderr) parser.print_help(sys.stderr)
sys.exit() sys.exit()
if len(options.add) > 0 and (len(options.patch) != 1 or not options.resave): if len(options.add) > 0 and (len(options.patch) != 1 or not options.resave):
print '--add can only be used with --resave and a single --patch value.' print('--add can only be used with --resave and a single --patch value.')
parser.print_help(sys.stderr) parser.print_help(sys.stderr)
sys.exit() sys.exit()
@ -144,7 +147,7 @@ if not os.path.isfile(patch_cfg):
# Read the patch configuration file. # Read the patch configuration file.
msg('Reading patch config %s' % patch_cfg) msg('Reading patch config %s' % patch_cfg)
scope = {} scope = {}
execfile(patch_cfg, scope) exec (compile(open(patch_cfg, "rb").read(), patch_cfg, 'exec'), scope)
patches = scope["patches"] patches = scope["patches"]
failed_patches = {} failed_patches = {}
@ -214,7 +217,7 @@ for patch in patches:
patch_path_abs = os.path.abspath(os.path.join(patch_root_abs, \ patch_path_abs = os.path.abspath(os.path.join(patch_root_abs, \
patch_path)) patch_path))
if os.path.exists(patch_path_abs): if os.path.exists(patch_path_abs):
with open(patch_path_abs, 'rb') as fp: with open(patch_path_abs, 'r', encoding='utf-8') as fp:
contents = fp.read() contents = fp.read()
if "\r\n" in contents: if "\r\n" in contents:
msg('Converting to Posix line endings for %s' % patch_path_abs) msg('Converting to Posix line endings for %s' % patch_path_abs)
@ -304,7 +307,7 @@ for patch in patches:
msg('Converting to Posix line endings for %s' % patch_file) msg('Converting to Posix line endings for %s' % patch_file)
result['out'] = result['out'].replace("\r\n", "\n") result['out'] = result['out'].replace("\r\n", "\n")
f = open(patch_file, 'wb') f = open(patch_file, 'w', encoding='utf-8')
f.write(result['out']) f.write(result['out'])
f.close() f.close()
else: else: