From a0d843144e8debee48c10bc094473389cc9b6994 Mon Sep 17 00:00:00 2001 From: Timothy Crosley Date: Fri, 8 Mar 2019 23:21:40 -0800 Subject: Add addition test to ensure */directory/*.py glob pattern works as expected --- test_isort.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test_isort.py b/test_isort.py index 998f32c5..58d27d17 100644 --- a/test_isort.py +++ b/test_isort.py @@ -2782,7 +2782,8 @@ def test_safety_excludes(tmpdir, enabled): assert file_names == {'verysafe.py'} -@pytest.mark.parametrize('skip_glob_assert', (([], 0, {os.sep.join(('code', 'file.py'))}), (['**/*.py'], 1, {}))) +@pytest.mark.parametrize('skip_glob_assert', (([], 0, {os.sep.join(('code', 'file.py'))}), (['**/*.py'], 1, {}), + (['*/code/*.py'], 1, {}))) def test_skip_glob(tmpdir, skip_glob_assert): skip_glob, skipped_count, file_names = skip_glob_assert base_dir = tmpdir.mkdir('build') -- cgit v1.2.1 From c409e8d32bb66e0f1de11b19b0e4236022fa9b51 Mon Sep 17 00:00:00 2001 From: Timothy Crosley Date: Fri, 8 Mar 2019 23:23:16 -0800 Subject: Fix issue with */ style glob tests --- isort/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/isort/settings.py b/isort/settings.py index b1075148..336d0b1e 100644 --- a/isort/settings.py +++ b/isort/settings.py @@ -344,7 +344,7 @@ def should_skip(filename, config, path=''): position = os.path.split(position[0]) for glob in config['skip_glob']: - if fnmatch.fnmatch(filename, glob): + if fnmatch.fnmatch(filename, glob) or fnmatch.fnmatch('/' + filename, glob): return True if not (os.path.isfile(os_path) or os.path.isdir(os_path) or os.path.islink(os_path)): -- cgit v1.2.1