From 655d3cec0d421daeb2fd6c752b3b99845da1efc0 Mon Sep 17 00:00:00 2001 From: Andrey Vokin Date: Thu, 16 Jan 2025 16:22:13 +0100 Subject: [PATCH] PY-78371 PyCharm does not mark imports in try/except blocks as unused Update test data. 1. Unresolved imports are not removed with optimize imports 2. Unresolved imports are not marked as unused (cherry picked from commit 2c32c368ae0907fb75ea76fc9749e903c160667c) IJ-CR-153189 GitOrigin-RevId: 153d42e7f61f8357eeb74f022e31bbe406e83c02 --- .../UnusedUnresolvedNameImported/a.py | 2 +- .../UnusedUnresolvedNameImportedSeveralTimes/a.py | 4 ++-- .../UsedUnresolvedNameImportedSeveralTimes/a.py | 2 +- .../unusedUnresolvedModuleImported.py | 2 +- .../NamespacePackageRedundantUnion/a.py | 2 +- python/testData/optimizeImports/alphabeticalOrder.after.py | 1 + .../optimizeImports/disableAlphabeticalOrder.after.py | 1 + python/testData/optimizeImports/unresolved.after.py | 2 +- .../after/src/src.py | 2 +- .../typeignore/TypeIgnoreInspectionSuppressorTest.kt | 2 +- 10 files changed, 11 insertions(+), 9 deletions(-) diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/UnusedUnresolvedNameImported/a.py b/python/testData/inspections/PyUnresolvedReferencesInspection/UnusedUnresolvedNameImported/a.py index a16e9e9dd4f4..0d894014a9d7 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 2db868c37709..c58176c717ee 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 9d9239e9f449..ee3758512e50 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 eggs() diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/unusedUnresolvedModuleImported.py b/python/testData/inspections/PyUnresolvedReferencesInspection/unusedUnresolvedModuleImported.py index a4002671f3c5..6be8e86a3162 100644 --- a/python/testData/inspections/PyUnresolvedReferencesInspection/unusedUnresolvedModuleImported.py +++ b/python/testData/inspections/PyUnresolvedReferencesInspection/unusedUnresolvedModuleImported.py @@ -1 +1 @@ -import spam +import spam diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection3K/NamespacePackageRedundantUnion/a.py b/python/testData/inspections/PyUnresolvedReferencesInspection3K/NamespacePackageRedundantUnion/a.py index c63cf74aa035..0d738afc8c07 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/optimizeImports/alphabeticalOrder.after.py b/python/testData/optimizeImports/alphabeticalOrder.after.py index 36f8a922ffe8..940511822cc3 100644 --- a/python/testData/optimizeImports/alphabeticalOrder.after.py +++ b/python/testData/optimizeImports/alphabeticalOrder.after.py @@ -12,6 +12,7 @@ import z from from a import C1 from alphabet import * +from alphabet import A from alphabet import B, A from alphabet import C from alphabet import D diff --git a/python/testData/optimizeImports/disableAlphabeticalOrder.after.py b/python/testData/optimizeImports/disableAlphabeticalOrder.after.py index 88da7f018d87..1959e8613cfa 100644 --- a/python/testData/optimizeImports/disableAlphabeticalOrder.after.py +++ b/python/testData/optimizeImports/disableAlphabeticalOrder.after.py @@ -9,6 +9,7 @@ import b import a from a import C1 from alphabet import D +from alphabet import A from b import func from import foo # broken diff --git a/python/testData/optimizeImports/unresolved.after.py b/python/testData/optimizeImports/unresolved.after.py index 8b137891791f..b014e1fe1183 100644 --- a/python/testData/optimizeImports/unresolved.after.py +++ b/python/testData/optimizeImports/unresolved.after.py @@ -1 +1 @@ - +import xyzzy_shazam diff --git a/python/testData/refactoring/move/optimizeImportsAfterMoveInvalidatesMembersToBeMoved/after/src/src.py b/python/testData/refactoring/move/optimizeImportsAfterMoveInvalidatesMembersToBeMoved/after/src/src.py index 1bc2fd45db35..a5b799947b5c 100644 --- a/python/testData/refactoring/move/optimizeImportsAfterMoveInvalidatesMembersToBeMoved/after/src/src.py +++ b/python/testData/refactoring/move/optimizeImportsAfterMoveInvalidatesMembersToBeMoved/after/src/src.py @@ -40,7 +40,7 @@ from serviceform.tasks.models import Task from .. import emails, utils from ..utils import ColorStr -from .mixins import CopyMixin +from .mixins import SubitemMixin, NameDescriptionMixin, CopyMixin from .people import Participant, ResponsibilityPerson from .email import EmailTemplate from .participation import QuestionAnswer diff --git a/python/testSrc/com/jetbrains/python/inspections/typeignore/TypeIgnoreInspectionSuppressorTest.kt b/python/testSrc/com/jetbrains/python/inspections/typeignore/TypeIgnoreInspectionSuppressorTest.kt index 492c5c9b02b7..38e07a983330 100644 --- a/python/testSrc/com/jetbrains/python/inspections/typeignore/TypeIgnoreInspectionSuppressorTest.kt +++ b/python/testSrc/com/jetbrains/python/inspections/typeignore/TypeIgnoreInspectionSuppressorTest.kt @@ -96,7 +96,7 @@ class TypeIgnoreInspectionSuppressorTest : PyTestCase() { fun testIgnoreUnresolvedReferenceImport() { doTestByText(""" import frobnicate # type: ignore - import frobnicate1 + import frobnicate1 """) }