Skip to content

Commit

Permalink
Fix accidental implicit string concatenation (pypa#4411)
Browse files Browse the repository at this point in the history
  • Loading branch information
abravalheri committed Jun 17, 2024
2 parents 956e5b2 + 5acf3d6 commit 8aa9855
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions newsfragments/4411.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix accidental implicit string concatenation.
3 changes: 2 additions & 1 deletion setuptools/command/bdist_egg.py
Original file line number Diff line number Diff line change
Expand Up @@ -382,8 +382,9 @@ def scan_module(egg_dir, base, name, stubs):
for bad in [
'getsource',
'getabsfile',
'getfile',
'getsourcefile',
'getfile' 'getsourcelines',
'getsourcelines',
'findsource',
'getcomments',
'getframeinfo',
Expand Down
3 changes: 2 additions & 1 deletion setuptools/tests/test_find_packages.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,8 @@ class TestFlatLayoutPackageFinder:
[
"pkg/__init__.py",
"examples/__init__.py",
"examples/file.py" "example/other_file.py",
"examples/file.py",
"example/other_file.py",
# Sub-packages should always be fine
"pkg/example/__init__.py",
"pkg/examples/__init__.py",
Expand Down

0 comments on commit 8aa9855

Please sign in to comment.