706a24e298
As discussed at the Epoxy PTG meeting, run an automated upgrade tool to make code python 3.9+ compliant. This patch is for code (non-tests). Result of running: $ pyupgrade --py39-plus $(git ls-files | grep ".py$") Fixed PEP8 errors introduced by pyupgrade by running: $ autopep8 --select=E127,E128,E501 --max-line-length 79 -r \ --in-place neutron Also did manual updates as necessary to fix other errors and warnings after above commands. Inspired by Octavia and Nova [0]. [0] https://review.opendev.org/c/openstack/nova/+/896986 Change-Id: Ife79df75dd2c9c42d4de36edef1d29b98f5d85da
139 lines
4.6 KiB
Python
Executable File
139 lines
4.6 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
|
|
# Copyright 2020 Red Hat, Inc.
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
from collections import namedtuple
|
|
import contextlib
|
|
import os
|
|
import re
|
|
import sys
|
|
|
|
from cliff import app
|
|
from cliff import command
|
|
from cliff import commandmanager
|
|
import download_gerrit_change
|
|
|
|
|
|
root_dir = os.path.dirname(os.path.realpath(__file__))
|
|
Migration = namedtuple('Migration', 'from_repo to_repo')
|
|
|
|
|
|
def read_mapfile(mapfile):
|
|
dirmaps = []
|
|
with open(mapfile) as mapfile_fd:
|
|
for line_buffer in mapfile_fd.readlines():
|
|
# ignore empty lines and anything after #
|
|
line_match = re.search("^([^#]+)", line_buffer.strip())
|
|
if not line_match:
|
|
continue
|
|
line_buffer = line_match.group(1)
|
|
# look for tuple of 2 elements
|
|
line_match = re.search(r"^([^\s]+)\s+(.+)", line_buffer.strip())
|
|
if not line_match:
|
|
continue
|
|
ovn_match, neutron_match = line_match.group(1), line_match.group(2)
|
|
dirmaps.append(Migration(neutron_match, ovn_match))
|
|
return dirmaps
|
|
|
|
|
|
def parse_input(dirmaps, patch_content, output_fd):
|
|
for line_buffer in patch_content.splitlines():
|
|
# locate markers in patch file for filenames and see if they need
|
|
# to me renamed based on dirmaps
|
|
filename_replaced = False
|
|
line_match = re.search(r"^\s*---\s+([^\s@]+)[\s@]*", line_buffer)
|
|
if not line_match:
|
|
line_match = re.search(r"^\s*\+\+\+\s+([^\s@]+)[\s@]*",
|
|
line_buffer)
|
|
if line_match:
|
|
for old, new in dirmaps:
|
|
new_line_buffer = line_buffer.replace(old, new)
|
|
if new_line_buffer != line_buffer:
|
|
filename_replaced = True
|
|
output_fd.write(f"{new_line_buffer}\n")
|
|
break
|
|
if not filename_replaced:
|
|
output_fd.write(f"{line_buffer}\n")
|
|
|
|
|
|
@contextlib.contextmanager
|
|
def open_output(filename=None):
|
|
if filename and filename != '-':
|
|
fh = open(filename, 'w')
|
|
else:
|
|
fh = sys.stdout
|
|
try:
|
|
yield fh
|
|
finally:
|
|
if fh is not sys.stdout:
|
|
fh.close()
|
|
|
|
|
|
class Config(command.Command):
|
|
def get_parser(self, prog_name):
|
|
parser = super().get_parser(prog_name)
|
|
parser.add_argument(
|
|
'-i', '--input_patch', required=True,
|
|
help='input_patch patch file or gerrit change')
|
|
parser.add_argument(
|
|
'-o', '--output_patch', default='-',
|
|
help='Output patch file. Default: stdout')
|
|
parser.add_argument(
|
|
'-m', '--mapfile',
|
|
default=os.path.join(root_dir, 'migrate_names.txt'),
|
|
help='Data file that specifies mapping to be applied to input')
|
|
reverse_group = parser.add_mutually_exclusive_group()
|
|
reverse_group.add_argument(
|
|
'--reverse',
|
|
action='store_true',
|
|
default=False,
|
|
help='Verify server certificate (default)',
|
|
)
|
|
reverse_group.add_argument(
|
|
'--no-reverse',
|
|
action='store_true',
|
|
help='Disable server certificate verification',
|
|
)
|
|
return parser
|
|
|
|
def take_action(self, parsed_args):
|
|
pass
|
|
|
|
|
|
def cli():
|
|
my_app = app.App(
|
|
description='Migrate names between repositories',
|
|
version='1.0.0',
|
|
command_manager=commandmanager.CommandManager('mycli.cli'))
|
|
cmd = Config(my_app, None)
|
|
parser = cmd.get_parser('migrate_names')
|
|
parsed_args = parser.parse_args(sys.argv[1:])
|
|
dirmaps = read_mapfile(parsed_args.mapfile)
|
|
if parsed_args.reverse:
|
|
dirmaps = [Migration(two, one) for one, two in dirmaps]
|
|
if os.path.isfile(parsed_args.input_patch):
|
|
with open(parsed_args.input_patch) as input_fd:
|
|
patch_content = ''.join(input_fd.readlines())
|
|
else:
|
|
patch_content = download_gerrit_change.fetch(parsed_args.input_patch)
|
|
|
|
with open_output(parsed_args.output_patch) as output_fd:
|
|
parse_input(dirmaps, patch_content, output_fd)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
cli()
|