MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 04:51:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

PY-29338 Revert "PY-28629: Fix resolving skeletons for implicit relative imports"

Browse Source 
This reverts commit be8aaaaf53.
This commit is contained in:
Andrey Vlasovskikh
2018-04-06 21:53:46 +03:00
parent d888d4ad1e
commit 4f5eefdea2
8 changed files with 2 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
python/src/com/jetbrains/python/psi/resolve/ResolveImportUtil.java
View File

@@ -335,10 +335,8 @@ public class ResolveImportUtil {
}
}
}
final PsiFile packageInit = PyUtil.as(PyUtil.turnDirIntoInit(parentDir), PsiFile.class);
if (!withoutForeign && packageInit != null) {
final PsiElement foreign = resolveForeignImports(packageInit, referencedName);
if (!withoutForeign && parent instanceof PsiFile) {
final PsiElement foreign = resolveForeignImports((PsiFile)parent, referencedName);
if (foreign != null) {
final ResolveResultList results = new ResolveResultList();
results.addAll(resolved);

1
python/testData/MockSdkWithBinaryModules/Lib/oldnumpy/__init__.py
View File

@@ -1 +0,0 @@
from core import *

1
python/testData/MockSdkWithBinaryModules/Lib/oldnumpy/core/__init__.py
View File

@@ -1 +0,0 @@
from umath import *

0
python/testData/MockSdkWithBinaryModules/python_stubs/oldnumpy/__init__.py
View File

0
python/testData/MockSdkWithBinaryModules/python_stubs/oldnumpy/core/__init__.py
View File

2
python/testData/MockSdkWithBinaryModules/python_stubs/oldnumpy/core/umath.py
View File

@@ -1,2 +0,0 @@
def log():
return 1.0

3
python/testData/resolve/multiFile/oldNumpyRelativeImport/OldNumpyRelativeImport.py
View File

@@ -1,3 +0,0 @@
import oldnumpy
oldnumpy.log
# <ref>

26
python/testSrc/com/jetbrains/python/PySkeletonResolveTest.java
View File

@@ -1,26 +0,0 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.jetbrains.python;
import com.intellij.testFramework.LightProjectDescriptor;
import com.jetbrains.python.fixtures.PyLightProjectDescriptor;
import com.jetbrains.python.fixtures.PyMultiFileResolveTestCase;
import com.jetbrains.python.psi.PyFunction;
import org.jetbrains.annotations.Nullable;
/**
* @author Yuli Fiterman
*/
public class PySkeletonResolveTest extends PyMultiFileResolveTestCase {
protected static final PyLightProjectDescriptor ourPyDescriptor = new PyLightProjectDescriptor("WithBinaryModules");
@Nullable
@Override
protected LightProjectDescriptor getProjectDescriptor() {
return ourPyDescriptor;
}
//PY-28629
public void testOldNumpyRelativeImport() {
assertInstanceOf(doResolve(), PyFunction.class);
}
}