Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"

1 files changed, 3 insertions, 1 deletions

diff --git a/python/src/com/jetbrains/python/inspections/unresolvedReference/PyUnresolvedReferencesInspection.java b/python/src/com/jetbrains/python/inspections/unresolvedReference/PyUnresolvedReferencesInspection.java
index c0fb3c1d620d..4fd58629c516 100644
--- a/python/src/com/jetbrains/python/inspections/unresolvedReference/PyUnresolvedReferencesInspection.java
+++ b/python/src/com/jetbrains/python/inspections/unresolvedReference/PyUnresolvedReferencesInspection.java
@@ -69,7 +69,6 @@ import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.util.*;
-import java.util.HashSet;
 
 import static com.jetbrains.python.inspections.quickfix.AddIgnoredIdentifierQuickFix.END_WILDCARD;
 
@@ -833,6 +832,9 @@ public class PyUnresolvedReferencesInspection extends PyInspection {
         else {
           actions.add(importFix);
         }
+        if (ScopeUtil.getScopeOwner(node) instanceof PyFunction) {
+          actions.add(importFix.forLocalImport());
+        }
       }
     }