Don't forget about redeclaration under except (PY-28593)

python/src/com/jetbrains/python/inspections/PyRedeclarationInspection.java

@@ -172,7 +172,7 @@ public class PyRedeclarationInspection extends PyInspection {
       final PsiElement element = instruction.getElement();
       if (element == null) return false;
 
-      if (element instanceof PyTryExceptStatement || element instanceof PyConditionalExpression) return true;
+      if (element instanceof PyTryPart || element instanceof PyExceptPart || element instanceof PyConditionalExpression) return true;
 
       if (element instanceof PyForStatement) {
         final PyForPart forPart = ((PyForStatement)element).getForPart();

python/testData/inspections/PyRedeclarationInspection/redeclarationInExcept.py

@@ -0,0 +1,4 @@
+try:
+    import a
+except:
+    a = None

python/testSrc/com/jetbrains/python/inspections/PyRedeclarationInspectionTest.java

@@ -164,6 +164,11 @@ public class PyRedeclarationInspectionTest extends PyInspectionTestCase {
     doTest();
   }
 
+  // PY-28593
+  public void testRedeclarationInExcept() {
+    doTest();
+  }
+
   @NotNull
   @Override
   protected Class<? extends PyInspection> getInspectionClass() {