From 0919cff107394f9012781229eb2bf077e76bd0e2 Mon Sep 17 00:00:00 2001 From: Mikhail Golubev Date: Wed, 29 Oct 2014 20:28:43 +0300 Subject: [PATCH] PY-13537 Exclude only object and __Classobj from ancestors (not all builtin classes) --- .../python/inspections/PyPep8NamingInspection.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/python/src/com/jetbrains/python/inspections/PyPep8NamingInspection.java b/python/src/com/jetbrains/python/inspections/PyPep8NamingInspection.java index 17780edb50b6..05e551aebc4e 100644 --- a/python/src/com/jetbrains/python/inspections/PyPep8NamingInspection.java +++ b/python/src/com/jetbrains/python/inspections/PyPep8NamingInspection.java @@ -27,6 +27,7 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.QualifiedName; import com.intellij.util.containers.ContainerUtil; +import com.jetbrains.python.PyNames; import com.jetbrains.python.codeInsight.controlflow.ControlFlowCache; import com.jetbrains.python.codeInsight.dataflow.scope.Scope; import com.jetbrains.python.inspections.quickfix.PyRenameElementQuickFix; @@ -129,7 +130,13 @@ public class PyPep8NamingInspection extends PyInspection { public boolean value(PyClass ancestor) { final PsiFile ancestorsModule = ancestor.getContainingFile(); final Sdk sdk = PyBuiltinCache.findSdkForFile(ancestorsModule); - return PythonSdkType.isStdLib(ancestorsModule.getVirtualFile(), sdk) && !PyBuiltinCache.getInstance(cls).isBuiltin(ancestor); + if (PythonSdkType.isStdLib(ancestorsModule.getVirtualFile(), sdk)) { + final PyBuiltinCache builtinCache = PyBuiltinCache.getInstance(cls); + if (ancestor != builtinCache.getClass(PyNames.OBJECT) && ancestor != builtinCache.getClass(PyNames.FAKE_OLD_BASE)) { + return true; + } + } + return false; } }); }