From 0bdf5b4c7d6ee12abfaf8297d793761558d38285 Mon Sep 17 00:00:00 2001
From: Mikhail Golubev <mikhail.golubev@jetbrains.com>
Date: Wed, 3 Dec 2025 18:37:20 +0200
Subject: [PATCH] fixup! PY-86002 Disable "python.typing.strict.unions" and
 revert the tests updated for PY-24834 in 253

Revert the revert of test changes that are not directly related to strict unions.


(cherry picked from commit 8a76bd91e040ad97e8ed680161f28370c84920f8)

IJ-MR-184619

GitOrigin-RevId: 4c293de3ecc3c8cb16869532fccc639e8c5a17ae
---
 .../importExceptImportError/importExceptImportError.py      | 6 +++---
 .../jetbrains/python/inspections/PyUnusedImportTest.java    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/python/testData/inspections/unusedImport/importExceptImportError/importExceptImportError.py b/python/testData/inspections/unusedImport/importExceptImportError/importExceptImportError.py
index 72c6466cad45..07483ddd818e 100644
--- a/python/testData/inspections/unusedImport/importExceptImportError/importExceptImportError.py
+++ b/python/testData/inspections/unusedImport/importExceptImportError/importExceptImportError.py
@@ -5,7 +5,7 @@ def f(x):
 
 def f(x):
     try:
-        from <error descr="Unresolved reference 'foo'">foo</error> import <warning descr="Module 'StringIO' not found">StringIO</warning>
+        from <error descr="Unresolved reference 'foo'">foo</error> import <weak_warning descr="Module 'StringIO' not found">StringIO</weak_warning>
     except Exception:
         pass
     return x
@@ -28,14 +28,14 @@ def f(x):
 try:
     import foo as bar
 except ImportError:
-    import <warning descr="Module 'bar' not found">bar</warning>
+    import <weak_warning descr="Module 'bar' not found">bar</weak_warning>
 
 # PY-3678
 def f():
     try:
         from foo import bar #pass
     except ImportError:
-        import <warning descr="Module 'bar' not found">bar</warning> #fail
+        import <weak_warning descr="Module 'bar' not found">bar</weak_warning> #fail
     finally:
         pass
 
diff --git a/python/testSrc/com/jetbrains/python/inspections/PyUnusedImportTest.java b/python/testSrc/com/jetbrains/python/inspections/PyUnusedImportTest.java
index f5ed7bec79b9..954d30322139 100644
--- a/python/testSrc/com/jetbrains/python/inspections/PyUnusedImportTest.java
+++ b/python/testSrc/com/jetbrains/python/inspections/PyUnusedImportTest.java
@@ -106,7 +106,7 @@ public class PyUnusedImportTest extends PyTestCase {
     myFixture.copyDirectoryToProject(getTestName(true), "");
     myFixture.configureFromTempProjectFile(filename);
     myFixture.enableInspections(PyUnusedImportsInspection.class, PyUnresolvedReferencesInspection.class);
-    myFixture.checkHighlighting(true, false, false);
+    myFixture.checkHighlighting(true, false, true);
   }
 
   @Override