diff options
Diffstat (limited to 'python/tidy/servo_tidy')
| -rw-r--r-- | python/tidy/servo_tidy/tidy.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/python/tidy/servo_tidy/tidy.py b/python/tidy/servo_tidy/tidy.py index d2840cc884c..a3c1c0a9a01 100644 --- a/python/tidy/servo_tidy/tidy.py +++ b/python/tidy/servo_tidy/tidy.py @@ -10,6 +10,7 @@ from __future__ import print_function import fnmatch +import glob import imp import itertools import json @@ -19,6 +20,7 @@ import subprocess import sys import colorama +import six import toml import voluptuous import yaml @@ -116,7 +118,7 @@ def is_iter_empty(iterator): def normilize_paths(paths): - if isinstance(paths, basestring): + if isinstance(paths, six.string_types): return os.path.join(*paths.split('/')) else: return [os.path.join(*path.split('/')) for path in paths] @@ -909,7 +911,7 @@ def check_config_file(config_file, print_text=True, no_wpt=False): exclude = config_content.get("ignore", {}) # Check for invalid listed ignored directories - exclude_dirs = exclude.get("directories", []) + exclude_dirs = [d for p in exclude.get("directories", []) for d in (glob.glob(p) or [p])] skip_dirs = ["./target", "./tests"] invalid_dirs = [d for d in exclude_dirs if not os.path.isdir(d) and not any(s in d for s in skip_dirs)] @@ -971,7 +973,8 @@ def check_config_file(config_file, print_text=True, no_wpt=False): def parse_config(config_file): exclude = config_file.get("ignore", {}) # Add list of ignored directories to config - config["ignore"]["directories"] += normilize_paths(exclude.get("directories", [])) + ignored_directories = [d for p in exclude.get("directories", []) for d in (glob.glob(p) or [p])] + config["ignore"]["directories"] += normilize_paths(ignored_directories) # Add list of ignored files to config config["ignore"]["files"] += normilize_paths(exclude.get("files", [])) # Add list of ignored packages to config |