Skip to content

Commit 8aa9855

Browse files
committed
Fix accidental implicit string concatenation (#4411)
2 parents 956e5b2 + 5acf3d6 commit 8aa9855

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

newsfragments/4411.bugfix.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix accidental implicit string concatenation.

setuptools/command/bdist_egg.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,9 @@ def scan_module(egg_dir, base, name, stubs):
382382
for bad in [
383383
'getsource',
384384
'getabsfile',
385+
'getfile',
385386
'getsourcefile',
386-
'getfile' 'getsourcelines',
387+
'getsourcelines',
387388
'findsource',
388389
'getcomments',
389390
'getframeinfo',

setuptools/tests/test_find_packages.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,8 @@ class TestFlatLayoutPackageFinder:
180180
[
181181
"pkg/__init__.py",
182182
"examples/__init__.py",
183-
"examples/file.py" "example/other_file.py",
183+
"examples/file.py",
184+
"example/other_file.py",
184185
# Sub-packages should always be fine
185186
"pkg/example/__init__.py",
186187
"pkg/examples/__init__.py",

0 commit comments

Comments
 (0)