diff options
Diffstat (limited to 'isort/main.py')
| -rw-r--r-- | isort/main.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/isort/main.py b/isort/main.py index 8842a318..3e7cbc6a 100644 --- a/isort/main.py +++ b/isort/main.py @@ -84,7 +84,7 @@ class SortAttempt(object): def sort_imports(file_name: str, **arguments: Any) -> Optional[SortAttempt]: try: - result = SortImports(file_name, check_skip=False, **arguments) + result = SortImports(file_name, **arguments) return SortAttempt(result.incorrectly_sorted, result.skipped) except IOError as e: print("WARNING: Unable to parse file {0} due to {1}".format(file_name, e)) @@ -98,9 +98,7 @@ def iter_source_code(paths: Iterable[str], config: MutableMapping[str, Any], ski for path in paths: if os.path.isdir(path): - for dirpath, dirnames, filenames in os.walk( - path, topdown=True, followlinks=True - ): + for dirpath, dirnames, filenames in os.walk(path, topdown=True, followlinks=True): for dirname in list(dirnames): if file_should_be_skipped(dirname, config, dirpath): skipped.append(dirname) @@ -108,7 +106,8 @@ def iter_source_code(paths: Iterable[str], config: MutableMapping[str, Any], ski for filename in filenames: filepath = os.path.join(dirpath, filename) if is_python_file(filepath): - if file_should_be_skipped(filename, config, dirpath): + relative_file = os.path.relpath(filepath, path) + if file_should_be_skipped(relative_file, config, path): skipped.append(filename) else: yield filepath @@ -311,6 +310,7 @@ def main(argv: Optional[Sequence[str]] = None) -> None: '-rc for recursive') sys.exit(1) + arguments['check_skip'] = False if 'settings_path' in arguments: sp = arguments['settings_path'] arguments['settings_path'] = os.path.abspath(sp) if os.path.isdir(sp) else os.path.dirname(os.path.abspath(sp)) |