Skip to content

Commit 47985f3

Browse files
authored
Fix regression introduced by #1186 and add tests (#1204)
This closes #1200
1 parent 395bfbd commit 47985f3

File tree

6 files changed

+18
-1
lines changed

6 files changed

+18
-1
lines changed

astroid/nodes/scoped_nodes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,7 @@ def relative_to_absolute_name(self, modname, level):
752752
if package_name:
753753
if not modname:
754754
return package_name
755-
return f"{package_name}.{modname.split('.')[0]}"
755+
return f"{package_name}.{modname}"
756756
return modname
757757

758758
def wildcard_import_names(self):

tests/testdata/python3/data/beyond_top_level_two/__init__.py

Whitespace-only changes.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# pylint: disable=missing-docstring
2+
3+
from .level1.beyond_top_level_two import func
4+
5+
6+
def do_something(var, some_other_var): # error
7+
func(var, some_other_var)
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
def func(var):
2+
pass
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
def func(var, some_other_var):
2+
pass

tests/unittest_inference.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6540,5 +6540,11 @@ def test_namespace_package() -> None:
65406540
resources.build_file("data/beyond_top_level/import_package.py")
65416541

65426542

6543+
def test_namespace_package_same_name() -> None:
6544+
"""check that a file using namespace packages and relative imports
6545+
with similar names is parseable"""
6546+
resources.build_file("data/beyond_top_level_two/a.py")
6547+
6548+
65436549
if __name__ == "__main__":
65446550
unittest.main()

0 commit comments

Comments
 (0)