diff options
| author | Tim Heap <tim@timheap.me> | 2016-12-15 10:11:37 +1100 |
|---|---|---|
| committer | Tim Heap <tim@timheap.me> | 2016-12-15 10:11:37 +1100 |
| commit | 980c2c5afd20fb9f7e50cb8ec0c42abc664da352 (patch) | |
| tree | 0b93c67d439fe23c52dd586d4e7acd54f3ebff52 | |
| parent | 5c5d40c367a1d32fdb0379e5961abd659f67a01f (diff) | |
| download | external_python_setuptools-980c2c5afd20fb9f7e50cb8ec0c42abc664da352.tar.gz external_python_setuptools-980c2c5afd20fb9f7e50cb8ec0c42abc664da352.tar.bz2 external_python_setuptools-980c2c5afd20fb9f7e50cb8ec0c42abc664da352.zip | |
Revert "Fix #849 global-exclude globbing"
This reverts commit 23aba916e1070d3cf9723af85a6ce07c89053931.
| -rwxr-xr-x | setuptools/command/egg_info.py | 4 | ||||
| -rw-r--r-- | setuptools/tests/test_manifest.py | 12 |
2 files changed, 2 insertions, 14 deletions
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py index 8a06e496..6f8fd874 100755 --- a/setuptools/command/egg_info.py +++ b/setuptools/command/egg_info.py @@ -457,7 +457,7 @@ class FileList(_FileList): """ if self.allfiles is None: self.findall() - match = translate_pattern(os.path.join('**', '*' + pattern)) + match = translate_pattern(os.path.join('**', pattern)) found = [f for f in self.allfiles if match.match(f)] self.extend(found) return bool(found) @@ -466,7 +466,7 @@ class FileList(_FileList): """ Exclude all files anywhere that match the pattern. """ - match = translate_pattern(os.path.join('**', '*' + pattern)) + match = translate_pattern(os.path.join('**', pattern)) return self._remove_files(match.match) def append(self, item): diff --git a/setuptools/tests/test_manifest.py b/setuptools/tests/test_manifest.py index 62b6d708..602c43a2 100644 --- a/setuptools/tests/test_manifest.py +++ b/setuptools/tests/test_manifest.py @@ -449,11 +449,6 @@ class TestFileListTest(TempDirTestCase): assert file_list.files == ['a.py', l('d/c.py')] self.assertWarnings() - file_list.process_template_line('global-include .txt') - file_list.sort() - assert file_list.files == ['a.py', 'b.txt', l('d/c.py')] - self.assertNoWarnings() - def test_global_exclude(self): l = make_local_path # global-exclude @@ -470,13 +465,6 @@ class TestFileListTest(TempDirTestCase): assert file_list.files == ['b.txt'] self.assertWarnings() - file_list = FileList() - file_list.files = ['a.py', 'b.txt', l('d/c.pyc'), 'e.pyo'] - file_list.process_template_line('global-exclude .py[co]') - file_list.sort() - assert file_list.files == ['a.py', 'b.txt'] - self.assertNoWarnings() - def test_recursive_include(self): l = make_local_path # recursive-include |