Skip to content

Commit c2b50d2

Browse files
committed
package data and glob pattern cleanup
1 parent e7a4c04 commit c2b50d2

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

{{cookiecutter.github_project_name}}/setupbase.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,7 @@ def _get_files(file_patterns, top=HERE):
507507
matchers = [_compile_pattern(p) for p in file_patterns]
508508

509509
files = set()
510+
510511
for root, dirnames, filenames in os.walk(top):
511512
# Don't recurse into node_modules
512513
if 'node_modules' in dirnames:
@@ -538,13 +539,7 @@ def _get_package_data(root, file_patterns=None):
538539
"""
539540
if file_patterns is None:
540541
file_patterns = ['*']
541-
if not isinstance(file_patterns, (list, tuple)):
542-
file_patterns = [file_patterns]
543-
files = _get_files(file_patterns, pjoin(HERE, root))
544-
return [pjoin(root, f) for f in files]
545-
546-
547-
542+
return _get_files(file_patterns, pjoin(HERE, root))
548543

549544

550545
def _compile_pattern(pat, ignore_case=True):
@@ -583,8 +578,7 @@ def _translate_glob(pat):
583578
translated_parts.append(_translate_glob_part(part))
584579
os_sep_class = '[%s]' % re.escape(SEPARATORS)
585580
res = _join_translated(translated_parts, os_sep_class)
586-
res = '{res}({os_sep_class}?.*)?\\Z(?ms)'.format(res=res, os_sep_class=os_sep_class)
587-
return res
581+
return '{res}\\Z(?ms)'.format(res=res)
588582

589583

590584
def _join_translated(translated_parts, os_sep_class):

0 commit comments

Comments
 (0)