MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fixed PY-8151 Don't highlight deprecation on symbols imported as fallbacks after ImportError

Browse Source
This commit is contained in:
Ekaterina Tuzova
2013-01-15 16:55:40 +04:00
parent 0bbefa7e77
commit 35ee12fefa
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/inspections/PyDeprecationInspection.java
+7 -3
View File
@@ -6,9 +6,8 @@ import com.intellij.codeInspection.ProblemsHolder;
import com.intellij.lang.ASTNode;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiElementVisitor;
import com.jetbrains.python.psi.PyFile;
import com.jetbrains.python.psi.PyFunction;
import com.jetbrains.python.psi.PyReferenceExpression;
import com.intellij.psi.util.PsiTreeUtil;
import com.jetbrains.python.psi.*;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -39,6 +38,11 @@ public class PyDeprecationInspection extends PyInspection {
@Override
public void visitPyReferenceExpression(PyReferenceExpression node) {
final PyExceptPart exceptPart = PsiTreeUtil.getParentOfType(node, PyExceptPart.class);
if (exceptPart != null) {
final PyExpression exceptClass = exceptPart.getExceptClass();
if (exceptClass != null && "ImportError".equals(exceptClass.getText())) return;
}
PsiElement resolveResult = node.getReference(resolveWithoutImplicits()).resolve();
String deprecationMessage = null;
if (resolveResult instanceof PyFunction) {
python/testData/deprecation/deprecatedAsFallback.py
+4
View File
@@ -0,0 +1,4 @@
try:
from urlparse import parse_qs, parse_qsl
except ImportError:
from cgi import parse_qs, parse_qsl
python/testSrc/com/jetbrains/python/PyDeprecationTest.java
+6
View File
@@ -27,6 +27,12 @@ public class PyDeprecationTest extends PyTestCase {
assertNotParsed((PyFile) myFixture.getFile());
}
public void testDeprecatedAsFallback() {
myFixture.enableInspections(PyDeprecationInspection.class);
myFixture.configureByFile("deprecation/deprecatedAsFallback.py");
myFixture.checkHighlighting(true, false, false);
}
public void testDeprecatedProperty() {
myFixture.enableInspections(PyDeprecationInspection.class);
myFixture.configureByFile("deprecation/deprecatedProperty.py");