From 72d8452aeb0b9daf87d108370aaab1601e5bdca5 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Thu, 27 Apr 2017 11:24:53 -0400 Subject: [PATCH] port list_deliverable_changes.py to python 3 Depends-On: Ifb435ea9c5d99639e1562761f9c48cbefb9db57f Change-Id: Ie5d62db38bd3fc77c045ef37b264e85c5fb65e43 Signed-off-by: Doug Hellmann --- jenkins/scripts/release-tools/list_deliverable_changes.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/jenkins/scripts/release-tools/list_deliverable_changes.py b/jenkins/scripts/release-tools/list_deliverable_changes.py index 3b915c32db..62b4d5980c 100755 --- a/jenkins/scripts/release-tools/list_deliverable_changes.py +++ b/jenkins/scripts/release-tools/list_deliverable_changes.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # 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 @@ -15,8 +15,6 @@ """Lists the most recent versions in the deliverable files. """ -from __future__ import print_function - import argparse import os.path import re @@ -35,7 +33,7 @@ def find_modified_deliverable_files(reporoot): results = subprocess.check_output( ['git', 'diff', '--name-only', '--pretty=format:', 'HEAD^'], cwd=reporoot, - ) + ).decode('utf-8') filenames = [ l.strip() for l in results.splitlines() @@ -66,7 +64,7 @@ def get_modified_deliverable_file_content(reporoot, filenames): if not os.path.exists(filename): # The file must have been deleted, skip it. continue - with open(filename, 'r') as f: + with open(filename, 'r', encoding='utf-8') as f: deliverable_data = yaml.load(f.read()) # If there are no releases listed in this file, skip it.