From 788889adae38c33e65838f4d829fbe91082f0f55 Mon Sep 17 00:00:00 2001
From: Semyon Proshev <Semyon.Proshev@jetbrains.com>
Date: Tue, 12 Jul 2016 14:51:24 +0300
Subject: [PATCH] PY-18965 Fixed: Python version 2.7 does not have method exec
 - regression

Ignore call 'exec' expressions in PyCompatibilityInspection
---
 .../PyCompatibilityInspection.java            |  2 +-
 .../PyCompatibilityInspection3K/exec.py       |  1 +
 .../Py3CompatibilityInspectionTest.java       | 40 +++++++++++++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 python/testData/inspections/PyCompatibilityInspection3K/exec.py
 create mode 100644 python/testSrc/com/jetbrains/python/inspections/Py3CompatibilityInspectionTest.java

diff --git a/python/src/com/jetbrains/python/inspections/PyCompatibilityInspection.java b/python/src/com/jetbrains/python/inspections/PyCompatibilityInspection.java
index 712a266e14b8..c96ee2753707 100644
--- a/python/src/com/jetbrains/python/inspections/PyCompatibilityInspection.java
+++ b/python/src/com/jetbrains/python/inspections/PyCompatibilityInspection.java
@@ -198,7 +198,7 @@ public class PyCompatibilityInspection extends PyInspection {
           for (int i = 0; i != myVersionsToProcess.size(); ++i) {
             LanguageLevel languageLevel = myVersionsToProcess.get(i);
             if (PyBuiltinCache.getInstance(resolved).isBuiltin(resolved)) {
-              if (!"print".equals(name) && !myUsedImports.contains(name) && UnsupportedFeaturesUtil.BUILTINS.get(languageLevel).contains(name)) {
+              if (!"print".equals(name) && !"exec".equals(name) && !myUsedImports.contains(name) && UnsupportedFeaturesUtil.BUILTINS.get(languageLevel).contains(name)) {
                 len = appendLanguageLevel(message, len, languageLevel);
               }
             }
diff --git a/python/testData/inspections/PyCompatibilityInspection3K/exec.py b/python/testData/inspections/PyCompatibilityInspection3K/exec.py
new file mode 100644
index 000000000000..6ac75a0fc4ae
--- /dev/null
+++ b/python/testData/inspections/PyCompatibilityInspection3K/exec.py
@@ -0,0 +1 @@
+exec('import __builtin__')
\ No newline at end of file
diff --git a/python/testSrc/com/jetbrains/python/inspections/Py3CompatibilityInspectionTest.java b/python/testSrc/com/jetbrains/python/inspections/Py3CompatibilityInspectionTest.java
new file mode 100644
index 000000000000..6984cfc3ce73
--- /dev/null
+++ b/python/testSrc/com/jetbrains/python/inspections/Py3CompatibilityInspectionTest.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.jetbrains.python.inspections;
+
+import com.intellij.testFramework.LightProjectDescriptor;
+import com.jetbrains.python.fixtures.PyTestCase;
+import org.jetbrains.annotations.Nullable;
+
+public class Py3CompatibilityInspectionTest extends PyTestCase {
+
+  @Nullable
+  @Override
+  protected LightProjectDescriptor getProjectDescriptor() {
+    return ourPy3Descriptor;
+  }
+
+  // PY-18965
+  public void testExec() {
+    doTest();
+  }
+
+  private void doTest() {
+    myFixture.configureByFile("inspections/PyCompatibilityInspection3K/" + getTestName(true) + ".py");
+    myFixture.enableInspections(PyCompatibilityInspection.class);
+    myFixture.checkHighlighting(true, false, false);
+  }
+}