Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve print statement compatibility with Python3

Browse source
This commit is contained in:
marmeladema 2019-10-14 00:15:02 +01:00
parent eda6d3e0c5
commit 4e1ee07a79
4 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
python/tidy/servo_tidy/tidy.py
View file

@ -7,6 +7,8 @@
# option. This file may not be copied, modified, or distributed
# except according to those terms.
from __future__ import print_function
import contextlib
import fnmatch
import imp
@ -514,7 +516,7 @@ def check_manifest_dirs(config_file, print_text=True):
lines = conf_file.splitlines(True)
if print_text:
print '\rChecking the wpt manifest file...'
print('\rChecking the wpt manifest file...')
p = parser.parse(lines)
paths = rec_parse(wpt_path("web-platform-tests"), p)
@ -908,7 +910,7 @@ def check_config_file(config_file, print_text=True):
lines = conf_file.splitlines(True)
if print_text:
print '\rChecking the config file...'
print('\rChecking the config file...')
config_content = toml.loads(conf_file)
exclude = config_content.get("ignore", {})
@ -995,7 +997,7 @@ def parse_config(config_file):
def check_directory_files(directories, print_text=True):
if print_text:
print '\rChecking directories for correct file extensions...'
print('\rChecking directories for correct file extensions...')
for directory, file_extensions in directories.items():
files = sorted(os.listdir(directory))
for filename in files:
@ -1015,7 +1017,7 @@ def collect_errors_for_files(files_to_check, checking_functions, line_checking_f
if not has_element:
raise StopIteration
if print_text:
print '\rChecking files for tidiness...'
print('\rChecking files for tidiness...')
for filename in files_to_check:
if not os.path.exists(filename):
@ -1037,7 +1039,7 @@ def collect_errors_for_files(files_to_check, checking_functions, line_checking_f
def get_dep_toml_files(only_changed_files=False):
if not only_changed_files:
print '\nRunning the dependency licensing lint...'
print('\nRunning the dependency licensing lint...')
for root, directories, filenames in os.walk(".cargo"):
for filename in filenames:
if filename == "Cargo.toml":
@ -1136,11 +1138,11 @@ def scan(only_changed_files=False, progress=True, stylo=False):
error = None
for error in errors:
colorama.init()
print "\r\033[94m{}\033[0m:\033[93m{}\033[0m: \033[91m{}\033[0m".format(*error)
print("\r\033[94m{}\033[0m:\033[93m{}\033[0m: \033[91m{}\033[0m".format(*error))
print
print()
if error is None:
colorama.init()
print "\033[92mtidy reported no errors.\033[0m"
print("\033[92mtidy reported no errors.\033[0m")
return int(error is not None)