From c1c6c8c945be758da023e0debcd7e8125f24dbfd Mon Sep 17 00:00:00 2001 From: Petr Date: Wed, 15 Oct 2025 18:11:14 +0200 Subject: [PATCH] PY-83529 Make type name reasonable (PyModuleType, PyImportedModuleType) (cherry picked from commit a5f8641bcae3cd01eb7ff174e289cbf3ca5e3b2b) GitOrigin-RevId: 41050e03a015e79c74ff54a390090e5e5f70d783 --- .../python/psi/types/PyImportedModuleType.java | 2 +- .../com/jetbrains/python/psi/types/PyModuleType.java | 6 +++++- .../MatchGenericProtocolWithModule/a.py | 6 +++--- .../MatchModuleWithProtocolNumOfAttrs/a.py | 2 +- .../MatchProtocolWithModuleCallables/a.py | 4 ++-- .../DisabledNumpyPyiStubs/a.py | 4 ++-- .../FromPackageImportBuiltin/a.py | 2 +- .../ImportHighlightLevel/a.py | 6 +++--- .../NamespacePackageAttributes/a.py | 2 +- .../OneUnsedOneMarked/a.py | 2 +- .../PreferImportedModuleOverNamespacePackage/a.py | 2 +- .../StubWithGetAttr/a.py | 2 +- .../UnusedUnresolvedNameImported/a.py | 2 +- .../UnusedUnresolvedNameImportedSeveralTimes/a.py | 4 ++-- .../UsedUnresolvedNameImportedSeveralTimes/a.py | 4 ++-- .../NamespacePackageRedundantUnion/a.py | 2 +- .../NestedPackageNamedAsSourceRoot/a.py | 2 +- .../NotImportedSubmodulesOfNamespacePackage/main.py | 4 ++-- .../PreferImportedModuleOverNamespacePackage/a.py | 2 +- .../addClassToImportedModule.py | 2 +- .../addClassToImportedPackage.py | 2 +- .../addClassToModuleInFromImport.py | 2 +- .../addClassToPackageInFromImport.py | 2 +- .../addFunctionToModuleInFromImport.py | 2 +- .../addFunctionToModuleInImport.py | 2 +- .../addFunctionToPackageInFromImport.py | 2 +- .../doNotAddFunctionInsideFromImportSource.py | 1 + .../inspections/unusedImport/unusedSubmodule/test1.py | 2 +- .../inspections/hiddenPyiImports/HiddenPyiImports.py | 10 +++++----- .../pyiRelativeImports/package_with_stub_in_path/a.pyi | 2 +- .../UnresolvedModuleAttributes.py | 4 ++-- python/testSrc/com/jetbrains/python/Py3TypeTest.java | 4 ++-- python/testSrc/com/jetbrains/python/PyTypeTest.java | 4 ++-- 33 files changed, 53 insertions(+), 48 deletions(-) create mode 100644 python/testData/inspections/doNotAddFunctionInsideFromImportSource/doNotAddFunctionInsideFromImportSource.py diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyImportedModuleType.java b/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyImportedModuleType.java index ed3be6930da8..fa8691bdd90e 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyImportedModuleType.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyImportedModuleType.java @@ -102,7 +102,7 @@ public class PyImportedModuleType implements PyType { @Override public String getName() { - return "imported module " + myImportedModule.getImportedPrefix().toString(); + return myImportedModule.getImportedPrefix().toString(); } @Override diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyModuleType.java b/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyModuleType.java index 479c5371ed30..2de00493ec60 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyModuleType.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/types/PyModuleType.java @@ -13,6 +13,7 @@ import com.intellij.psi.*; import com.intellij.psi.scope.PsiScopeProcessor; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.QualifiedName; +import com.intellij.util.LazyInitializer; import com.intellij.util.ObjectUtils; import com.intellij.util.ProcessingContext; import com.intellij.util.Processor; @@ -41,12 +42,14 @@ import static com.jetbrains.python.psi.PyUtil.inSameFile; public class PyModuleType implements PyType { // Modules don't descend from object private final @NotNull PyFile myModule; + private final @NotNull LazyInitializer.LazyValue<@Nullable QualifiedName> myQualifiedName; private static final ImmutableSet MODULE_MEMBERS = ImmutableSet.of( "__name__", "__file__", "__path__", "__doc__", "__dict__", "__package__"); public PyModuleType(@NotNull PyFile source) { myModule = source; + myQualifiedName = LazyInitializer.create(() -> QualifiedNameFinder.findShortestImportableQName(myModule)); } @@ -565,7 +568,8 @@ public class PyModuleType implements PyType { // Modules don't descend from obje @Override public String getName() { - return myModule.getName(); + QualifiedName qualifiedName = myQualifiedName.get(); + return qualifiedName != null ? qualifiedName.toString() : ""; } @Override diff --git a/python/testData/inspections/PyTypeCheckerInspection/MatchGenericProtocolWithModule/a.py b/python/testData/inspections/PyTypeCheckerInspection/MatchGenericProtocolWithModule/a.py index 9182dfb7bffa..d2167c4797ba 100644 --- a/python/testData/inspections/PyTypeCheckerInspection/MatchGenericProtocolWithModule/a.py +++ b/python/testData/inspections/PyTypeCheckerInspection/MatchGenericProtocolWithModule/a.py @@ -14,6 +14,6 @@ class Options1(Protocol[T1, T2, T3]): def foo(self, x: T1, y: T2) -> T3: ... t1: Options1[int, str, bool] = mod -t2: Options1[int, float, bool] = mod -t3: Options1[str, float, bool] = mod -t4: Options1[int, str, str] = mod \ No newline at end of file +t2: Options1[int, float, bool] = mod +t3: Options1[str, float, bool] = mod +t4: Options1[int, str, str] = mod \ No newline at end of file diff --git a/python/testData/inspections/PyTypeCheckerInspection/MatchModuleWithProtocolNumOfAttrs/a.py b/python/testData/inspections/PyTypeCheckerInspection/MatchModuleWithProtocolNumOfAttrs/a.py index 23713640f49f..7cece5aefb8a 100644 --- a/python/testData/inspections/PyTypeCheckerInspection/MatchModuleWithProtocolNumOfAttrs/a.py +++ b/python/testData/inspections/PyTypeCheckerInspection/MatchModuleWithProtocolNumOfAttrs/a.py @@ -13,4 +13,4 @@ class Options2(Protocol): op1: Options1 = _protocols_modules1 -op1: Options2 = _protocols_modules1 \ No newline at end of file +op1: Options2 = _protocols_modules1 \ No newline at end of file diff --git a/python/testData/inspections/PyTypeCheckerInspection/MatchProtocolWithModuleCallables/a.py b/python/testData/inspections/PyTypeCheckerInspection/MatchProtocolWithModuleCallables/a.py index 84b7b652ddf6..3f342ed66df4 100644 --- a/python/testData/inspections/PyTypeCheckerInspection/MatchProtocolWithModuleCallables/a.py +++ b/python/testData/inspections/PyTypeCheckerInspection/MatchProtocolWithModuleCallables/a.py @@ -21,5 +21,5 @@ class Reporter3(Protocol): rp1: Reporter1 = _protocols_modules2 # OK -rp2: Reporter2 = _protocols_modules2 -rp3: Reporter3 = _protocols_modules2 \ No newline at end of file +rp2: Reporter2 = _protocols_modules2 +rp3: Reporter3 = _protocols_modules2 \ No newline at end of file diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/DisabledNumpyPyiStubs/a.py b/python/testData/inspections/PyUnresolvedReferencesInspection/DisabledNumpyPyiStubs/a.py index 37c062bc1bff..b19f73a12d39 100644 --- a/python/testData/inspections/PyUnresolvedReferencesInspection/DisabledNumpyPyiStubs/a.py +++ b/python/testData/inspections/PyUnresolvedReferencesInspection/DisabledNumpyPyiStubs/a.py @@ -1,5 +1,5 @@ import numpy numpy.foo() -numpy.bar() -numpy.baz() \ No newline at end of file +numpy.bar() +numpy.baz() \ No newline at end of file diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/FromPackageImportBuiltin/a.py b/python/testData/inspections/PyUnresolvedReferencesInspection/FromPackageImportBuiltin/a.py index 324fbdedb299..210be45d5cc4 100644 --- a/python/testData/inspections/PyUnresolvedReferencesInspection/FromPackageImportBuiltin/a.py +++ b/python/testData/inspections/PyUnresolvedReferencesInspection/FromPackageImportBuiltin/a.py @@ -1,3 +1,3 @@ -from importSource import len +from importSource import len len() diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/ImportHighlightLevel/a.py b/python/testData/inspections/PyUnresolvedReferencesInspection/ImportHighlightLevel/a.py index 736383e5c5a5..39ed452d9b66 100644 --- a/python/testData/inspections/PyUnresolvedReferencesInspection/ImportHighlightLevel/a.py +++ b/python/testData/inspections/PyUnresolvedReferencesInspection/ImportHighlightLevel/a.py @@ -1,11 +1,11 @@ import un1 import os.un2 -from os import un3 +from os import un3 from un4.un5 import un6 -from os.un7 import un8 +from os.un7 import un8 un1 -os.un2 +os.un2 un3 un6 un8 diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/NamespacePackageAttributes/a.py b/python/testData/inspections/PyUnresolvedReferencesInspection/NamespacePackageAttributes/a.py index 9d9ef651c5f8..bc4170d00744 100644 --- a/python/testData/inspections/PyUnresolvedReferencesInspection/NamespacePackageAttributes/a.py +++ b/python/testData/inspections/PyUnresolvedReferencesInspection/NamespacePackageAttributes/a.py @@ -1,4 +1,4 @@ import p1.m1 #pass print(p1.m1) #pass -print(p1.m2) #fail +print(p1.m2) #fail diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/OneUnsedOneMarked/a.py b/python/testData/inspections/PyUnresolvedReferencesInspection/OneUnsedOneMarked/a.py index 423ed3675c9b..4986e8a362c5 100644 --- a/python/testData/inspections/PyUnresolvedReferencesInspection/OneUnsedOneMarked/a.py +++ b/python/testData/inspections/PyUnresolvedReferencesInspection/OneUnsedOneMarked/a.py @@ -1,4 +1,4 @@ -from library import foo,bar +from library import foo,bar print(foo) \ No newline at end of file diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/PreferImportedModuleOverNamespacePackage/a.py b/python/testData/inspections/PyUnresolvedReferencesInspection/PreferImportedModuleOverNamespacePackage/a.py index 4a65c999ba30..91781a5347a6 100644 --- a/python/testData/inspections/PyUnresolvedReferencesInspection/PreferImportedModuleOverNamespacePackage/a.py +++ b/python/testData/inspections/PyUnresolvedReferencesInspection/PreferImportedModuleOverNamespacePackage/a.py @@ -1,4 +1,4 @@ import c print(c.A().foo()) -print(c.b.A().foo()) \ No newline at end of file +print(c.b.A().foo()) \ No newline at end of file diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/StubWithGetAttr/a.py b/python/testData/inspections/PyUnresolvedReferencesInspection/StubWithGetAttr/a.py index 2b9df1adc7ed..ababd2c4fe49 100644 --- a/python/testData/inspections/PyUnresolvedReferencesInspection/StubWithGetAttr/a.py +++ b/python/testData/inspections/PyUnresolvedReferencesInspection/StubWithGetAttr/a.py @@ -1,6 +1,6 @@ from complete import a from complete import b -from complete import e +from complete import e from incomplete import c from incomplete import d diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/UnusedUnresolvedNameImported/a.py b/python/testData/inspections/PyUnresolvedReferencesInspection/UnusedUnresolvedNameImported/a.py index 0d894014a9d7..72455a9359af 100644 --- a/python/testData/inspections/PyUnresolvedReferencesInspection/UnusedUnresolvedNameImported/a.py +++ b/python/testData/inspections/PyUnresolvedReferencesInspection/UnusedUnresolvedNameImported/a.py @@ -1 +1 @@ -from my_module import eggs +from my_module import eggs diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/UnusedUnresolvedNameImportedSeveralTimes/a.py b/python/testData/inspections/PyUnresolvedReferencesInspection/UnusedUnresolvedNameImportedSeveralTimes/a.py index c58176c717ee..c11dfd8e0db4 100644 --- a/python/testData/inspections/PyUnresolvedReferencesInspection/UnusedUnresolvedNameImportedSeveralTimes/a.py +++ b/python/testData/inspections/PyUnresolvedReferencesInspection/UnusedUnresolvedNameImportedSeveralTimes/a.py @@ -1,2 +1,2 @@ -from my_module import eggs -from my_module import eggs +from my_module import eggs +from my_module import eggs diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/UsedUnresolvedNameImportedSeveralTimes/a.py b/python/testData/inspections/PyUnresolvedReferencesInspection/UsedUnresolvedNameImportedSeveralTimes/a.py index ee3758512e50..207c1abc4261 100644 --- a/python/testData/inspections/PyUnresolvedReferencesInspection/UsedUnresolvedNameImportedSeveralTimes/a.py +++ b/python/testData/inspections/PyUnresolvedReferencesInspection/UsedUnresolvedNameImportedSeveralTimes/a.py @@ -1,4 +1,4 @@ -from my_package.my_module import eggs -from my_package.my_module import eggs +from my_package.my_module import eggs +from my_package.my_module import eggs eggs() diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection3K/NamespacePackageRedundantUnion/a.py b/python/testData/inspections/PyUnresolvedReferencesInspection3K/NamespacePackageRedundantUnion/a.py index 0d738afc8c07..f13186d554f1 100644 --- a/python/testData/inspections/PyUnresolvedReferencesInspection3K/NamespacePackageRedundantUnion/a.py +++ b/python/testData/inspections/PyUnresolvedReferencesInspection3K/NamespacePackageRedundantUnion/a.py @@ -1 +1 @@ -from nspkg1 import not_found \ No newline at end of file +from nspkg1 import not_found \ No newline at end of file diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection3K/NestedPackageNamedAsSourceRoot/a.py b/python/testData/inspections/PyUnresolvedReferencesInspection3K/NestedPackageNamedAsSourceRoot/a.py index ab865bfa3c27..ef7681bbaa12 100644 --- a/python/testData/inspections/PyUnresolvedReferencesInspection3K/NestedPackageNamedAsSourceRoot/a.py +++ b/python/testData/inspections/PyUnresolvedReferencesInspection3K/NestedPackageNamedAsSourceRoot/a.py @@ -1,6 +1,6 @@ from lib1 import m1 from lib1.m1 import x -from lib1.m1 import something +from lib1.m1 import something print(m1, x, something) diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection3K/NotImportedSubmodulesOfNamespacePackage/main.py b/python/testData/inspections/PyUnresolvedReferencesInspection3K/NotImportedSubmodulesOfNamespacePackage/main.py index 54e2273f4550..ac82148c4114 100644 --- a/python/testData/inspections/PyUnresolvedReferencesInspection3K/NotImportedSubmodulesOfNamespacePackage/main.py +++ b/python/testData/inspections/PyUnresolvedReferencesInspection3K/NotImportedSubmodulesOfNamespacePackage/main.py @@ -1,5 +1,5 @@ import nspkg1.m2 print(nspkg1.m2) -print(nspkg1.m3) -print(nspkg1.nssubpkg1) +print(nspkg1.m3) +print(nspkg1.nssubpkg1) diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection3K/PreferImportedModuleOverNamespacePackage/a.py b/python/testData/inspections/PyUnresolvedReferencesInspection3K/PreferImportedModuleOverNamespacePackage/a.py index 4a65c999ba30..91781a5347a6 100644 --- a/python/testData/inspections/PyUnresolvedReferencesInspection3K/PreferImportedModuleOverNamespacePackage/a.py +++ b/python/testData/inspections/PyUnresolvedReferencesInspection3K/PreferImportedModuleOverNamespacePackage/a.py @@ -1,4 +1,4 @@ import c print(c.A().foo()) -print(c.b.A().foo()) \ No newline at end of file +print(c.b.A().foo()) \ No newline at end of file diff --git a/python/testData/inspections/addClassToImportedModule/addClassToImportedModule.py b/python/testData/inspections/addClassToImportedModule/addClassToImportedModule.py index 51da5701a9a8..592ccfdf8697 100644 --- a/python/testData/inspections/addClassToImportedModule/addClassToImportedModule.py +++ b/python/testData/inspections/addClassToImportedModule/addClassToImportedModule.py @@ -1,3 +1,3 @@ import mod -clzz = mod.Clzz() +clzz = mod.Clzz() diff --git a/python/testData/inspections/addClassToImportedPackage/addClassToImportedPackage.py b/python/testData/inspections/addClassToImportedPackage/addClassToImportedPackage.py index f69d9a1ca18d..c4bce26bdcff 100644 --- a/python/testData/inspections/addClassToImportedPackage/addClassToImportedPackage.py +++ b/python/testData/inspections/addClassToImportedPackage/addClassToImportedPackage.py @@ -1,3 +1,3 @@ import pkg -clzz = pkg.Clzz() +clzz = pkg.Clzz() diff --git a/python/testData/inspections/addClassToModuleInFromImport/addClassToModuleInFromImport.py b/python/testData/inspections/addClassToModuleInFromImport/addClassToModuleInFromImport.py index bb8badfa00e3..f834fbfbc254 100644 --- a/python/testData/inspections/addClassToModuleInFromImport/addClassToModuleInFromImport.py +++ b/python/testData/inspections/addClassToModuleInFromImport/addClassToModuleInFromImport.py @@ -1,4 +1,4 @@ -from mod import Clzz +from mod import Clzz clzz = Clzz() diff --git a/python/testData/inspections/addClassToPackageInFromImport/addClassToPackageInFromImport.py b/python/testData/inspections/addClassToPackageInFromImport/addClassToPackageInFromImport.py index 082fa1c3105e..bb040e9c9cd4 100644 --- a/python/testData/inspections/addClassToPackageInFromImport/addClassToPackageInFromImport.py +++ b/python/testData/inspections/addClassToPackageInFromImport/addClassToPackageInFromImport.py @@ -1,3 +1,3 @@ -from mypack import Clzz +from mypack import Clzz clzz = Clzz() \ No newline at end of file diff --git a/python/testData/inspections/addFunctionToModuleInFromImport/addFunctionToModuleInFromImport.py b/python/testData/inspections/addFunctionToModuleInFromImport/addFunctionToModuleInFromImport.py index e6ff16a4691d..1520b8411ece 100644 --- a/python/testData/inspections/addFunctionToModuleInFromImport/addFunctionToModuleInFromImport.py +++ b/python/testData/inspections/addFunctionToModuleInFromImport/addFunctionToModuleInFromImport.py @@ -1,4 +1,4 @@ -from mod import foo +from mod import foo foo() diff --git a/python/testData/inspections/addFunctionToModuleInImport/addFunctionToModuleInImport.py b/python/testData/inspections/addFunctionToModuleInImport/addFunctionToModuleInImport.py index 28fe4fb891c8..8ee6d87b32f5 100644 --- a/python/testData/inspections/addFunctionToModuleInImport/addFunctionToModuleInImport.py +++ b/python/testData/inspections/addFunctionToModuleInImport/addFunctionToModuleInImport.py @@ -1,3 +1,3 @@ import mod -mod.func() +mod.func() diff --git a/python/testData/inspections/addFunctionToPackageInFromImport/addFunctionToPackageInFromImport.py b/python/testData/inspections/addFunctionToPackageInFromImport/addFunctionToPackageInFromImport.py index dc7e9bdbd193..39fa95845fd9 100644 --- a/python/testData/inspections/addFunctionToPackageInFromImport/addFunctionToPackageInFromImport.py +++ b/python/testData/inspections/addFunctionToPackageInFromImport/addFunctionToPackageInFromImport.py @@ -1,3 +1,3 @@ -from mypack import foo +from mypack import foo a = foo() \ No newline at end of file diff --git a/python/testData/inspections/doNotAddFunctionInsideFromImportSource/doNotAddFunctionInsideFromImportSource.py b/python/testData/inspections/doNotAddFunctionInsideFromImportSource/doNotAddFunctionInsideFromImportSource.py new file mode 100644 index 000000000000..42ad39ffdbf4 --- /dev/null +++ b/python/testData/inspections/doNotAddFunctionInsideFromImportSource/doNotAddFunctionInsideFromImportSource.py @@ -0,0 +1 @@ +from mod.unresolved import something diff --git a/python/testData/inspections/unusedImport/unusedSubmodule/test1.py b/python/testData/inspections/unusedImport/unusedSubmodule/test1.py index 40e9e79d3ac1..5db035ef0659 100644 --- a/python/testData/inspections/unusedImport/unusedSubmodule/test1.py +++ b/python/testData/inspections/unusedImport/unusedSubmodule/test1.py @@ -1,3 +1,3 @@ import p1.m1 -print(p1.m2.a2) +print(p1.m2.a2) diff --git a/python/testData/pyi/inspections/hiddenPyiImports/HiddenPyiImports.py b/python/testData/pyi/inspections/hiddenPyiImports/HiddenPyiImports.py index 4765ef508d81..e54b3e9afd18 100644 --- a/python/testData/pyi/inspections/hiddenPyiImports/HiddenPyiImports.py +++ b/python/testData/pyi/inspections/hiddenPyiImports/HiddenPyiImports.py @@ -1,10 +1,10 @@ -from m1 import foo -from m1 import bar -from m1 import bar_imported +from m1 import foo +from m1 import bar +from m1 import bar_imported from m1 import baz from m1 import quux -from m1 import m2 -from m1 import m2_imported +from m1 import m2 +from m1 import m2_imported from m1 import m3 print(foo, bar, bar_imported, baz, m2, m2_imported, m3, quux) diff --git a/python/testData/pyi/inspections/pyiRelativeImports/package_with_stub_in_path/a.pyi b/python/testData/pyi/inspections/pyiRelativeImports/package_with_stub_in_path/a.pyi index bb877b1b3c73..399c721eda9f 100644 --- a/python/testData/pyi/inspections/pyiRelativeImports/package_with_stub_in_path/a.pyi +++ b/python/testData/pyi/inspections/pyiRelativeImports/package_with_stub_in_path/a.pyi @@ -1,5 +1,5 @@ from .m1 import foo -from .m1 import bar +from .m1 import bar foo2 = foo bar2 = bar \ No newline at end of file diff --git a/python/testData/pyi/inspections/unresolvedModuleAttributes/UnresolvedModuleAttributes.py b/python/testData/pyi/inspections/unresolvedModuleAttributes/UnresolvedModuleAttributes.py index ca20cf9333e2..13ecff8e822e 100644 --- a/python/testData/pyi/inspections/unresolvedModuleAttributes/UnresolvedModuleAttributes.py +++ b/python/testData/pyi/inspections/unresolvedModuleAttributes/UnresolvedModuleAttributes.py @@ -1,6 +1,6 @@ import m1 -print(m1.module_only_attr) +print(m1.module_only_attr) print(m1.provided_attr) -print(m1.not_provided_attr) +print(m1.not_provided_attr) diff --git a/python/testSrc/com/jetbrains/python/Py3TypeTest.java b/python/testSrc/com/jetbrains/python/Py3TypeTest.java index 462506339764..5940d90ea0c4 100644 --- a/python/testSrc/com/jetbrains/python/Py3TypeTest.java +++ b/python/testSrc/com/jetbrains/python/Py3TypeTest.java @@ -4184,11 +4184,11 @@ public class Py3TypeTest extends PyTestCase { String testDir = TEST_DIRECTORY + getTestName(false); runWithAdditionalClassEntryInSdkRoots(testDir + "/site-packages", () -> { runWithAdditionalClassEntryInSdkRoots(testDir + "/python_stubs", () -> { - doTest("imported module pkg", """ + doTest("pkg", """ import pkg.subpkg expr = pkg """); - doTest("__init__.py", """ + doTest("pkg.subpkg", """ import pkg.subpkg expr = pkg.subpkg """); diff --git a/python/testSrc/com/jetbrains/python/PyTypeTest.java b/python/testSrc/com/jetbrains/python/PyTypeTest.java index 8ac6f3138c0f..40d1c79b6866 100644 --- a/python/testSrc/com/jetbrains/python/PyTypeTest.java +++ b/python/testSrc/com/jetbrains/python/PyTypeTest.java @@ -2869,14 +2869,14 @@ public class PyTypeTest extends PyTestCase { // PY-25751 public void testNotImportedModuleInDunderAll() { - doMultiFileTest("Union[aaa.py, Any]", + doMultiFileTest("Union[pkg.aaa, Any]", "from pkg import *\n" + "expr = aaa"); } // PY-25751 public void testNotImportedPackageInDunderAll() { - doMultiFileTest("Union[__init__.py, Any]", + doMultiFileTest("Union[pkg.aaa, Any]", "from pkg import *\n" + "expr = aaa"); }