MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 14:23:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

PY-18098 Import "numpy" doesn't have effect

Browse Source 
ignore same-named modules imported with "asName"
This commit is contained in:
Ekaterina Tuzova
2016-05-16 14:19:14 +03:00
parent 97511d7099
commit 186b9e7085
4 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
python/src/com/jetbrains/python/codeInsight/imports/AddImportHelper.java
View File

@@ -297,7 +297,7 @@ public class AddImportHelper {
for (PyImportElement element : existingImports) { for (PyImportElement element : existingImports) {
final QualifiedName qName = element.getImportedQName(); final QualifiedName qName = element.getImportedQName();
if (qName != null && name.equals(qName.toString())) { if (qName != null && name.equals(qName.toString())) {
if ((asName != null && asName.equals(element.getAsName())) || asName == null) { if ((asName != null && asName.equals(element.getAsName())) || (asName == null && element.getAsName() == null)) {
return false; return false;
} }
} }

6
python/testData/addImport/ignoreImportedAsModule.after.py Normal file
View File

@@ -0,0 +1,6 @@
import numpy as np
import numpy
np.ones(3)
numpy.asarray([1,2,3]) # <-- invoke qfix here

5
python/testData/addImport/ignoreImportedAsModule.py Normal file
View File

@@ -0,0 +1,5 @@
import numpy as np
np.ones(3)
numpy.asarray([1,2,3]) # <-- invoke qfix here

5
python/testSrc/com/jetbrains/python/PyAddImportTest.java
View File

@@ -100,6 +100,11 @@ public class PyAddImportTest extends PyTestCase {
testLocalImport(); testLocalImport();
} }
// PY-18098
public void testIgnoreImportedAsModule() {
doAddImport("numpy", THIRD_PARTY);
}
// PY-16373 // PY-16373
public void testLocalImportQuickFixAvailable() { public void testLocalImportQuickFixAvailable() {
myFixture.configureByFile(getTestName(true) + ".py"); myFixture.configureByFile(getTestName(true) + ".py");