Skip to content
Permalink
Browse files
Fix the other 2 python scripts that generates license. (#12340)
Fixes YAML.load_all issues on two of the Python scripts that generate license.

The broken Python files interfere with some of the Maven tasks.
  • Loading branch information
didip committed Apr 8, 2022
1 parent d98cbd9 commit df48e446b04ce0272a7d0c9e0a70dc5cedb07076
Showing 2 changed files with 5 additions and 5 deletions.
@@ -102,7 +102,7 @@ def print_license(license):
license_phrase += "see {}".format(each_file)
else:
license_phrase += ", {}".format(each_file)

license_phrase += "."

print_license_phrase(license_phrase)
@@ -133,11 +133,11 @@ def print_license_name_underbar(license_name):

def generate_license(apache_license_v2, license_yaml):
print_log_to_stderr("=== Generating the contents of LICENSE.BINARY file ===\n")

# Print Apache license first.
print_outfile(apache_license_v2)
with open(license_yaml, encoding='utf-8') as registry_file:
licenses_list = list(yaml.load_all(registry_file))
licenses_list = list(yaml.load_all(registry_file, Loader=yaml.Loader))

# Group licenses by license_name, license_category, and then module.
licenses_map = {}
@@ -172,7 +172,7 @@ def generate_license(apache_license_v2, license_yaml):
parser.add_argument('license_yaml', metavar='<path to license.yaml>', type=str)
parser.add_argument('out_path', metavar='<path to output file>', type=str)
args = parser.parse_args()

with open(args.apache_license, encoding="ascii") as apache_license_file:
apache_license_v2 = apache_license_file.read()
license_yaml = args.license_yaml
@@ -57,7 +57,7 @@ def generate_notice(source_notice, dependences_yaml):
# Print Apache license first.
print_outfile(source_notice)
with open(dependences_yaml, encoding='utf-8') as registry_file:
dependencies = list(yaml.load_all(registry_file))
dependencies = list(yaml.load_all(registry_file, Loader=yaml.Loader))

# Group dependencies by module
modules_map = defaultdict(list)

0 comments on commit df48e44

Please sign in to comment.