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

Support for implicit namespace packages in Python 3.3 (PY-7156)

Browse Source
This commit is contained in:
Andrey Vlasovskikh
2012-08-27 20:00:06 +04:00
parent 5ee402d1c6
commit 5db6ed1df7
6 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
python/src/com/jetbrains/python/psi/PyUtil.java
View File

@@ -648,6 +648,9 @@ public class PyUtil {
if (turnDirIntoInit(directory) != null) {
return true;
}
if (LanguageLevel.forFile(directory.getVirtualFile()).isAtLeast(LanguageLevel.PYTHON33)) {
return true;
}
return hasNamespacePackageFile(directory);
}

4
python/testData/resolve/multiFile/fromPython33NamespacePackageImport/FromPython33NamespacePackageImport.py Normal file
View File

@@ -0,0 +1,4 @@
from p1.m1 import foo
foo()
#<ref>

2
python/testData/resolve/multiFile/fromPython33NamespacePackageImport/p1/m1.py Normal file
View File

@@ -0,0 +1,2 @@
def foo():
pass

4
python/testData/resolve/multiFile/python33NamespacePackage/Python33NamespacePackage.py Normal file
View File

@@ -0,0 +1,4 @@
import p1
p1
#<ref>

2
python/testData/resolve/multiFile/python33NamespacePackage/p1/m1.py Normal file
View File

@@ -0,0 +1,2 @@
def foo():
pass

23
python/testSrc/com/jetbrains/python/PyMultiFileResolveTest.java
View File

@@ -404,6 +404,29 @@ public class PyMultiFileResolveTest extends PyResolveTestCase {
assertResolvesTo(PyFunction.class, "foo");
}
// PY-7156
public void testPython33NamespacePackage() {
setLanguageLevel(LanguageLevel.PYTHON33);
try {
final PsiElement element = doResolve();
assertInstanceOf(element, PyImportedModule.class);
final PyImportedModule module = (PyImportedModule)element;
assertEquals("p1", module.getImportedPrefix().toString());
} finally {
setLanguageLevel(null);
}
}
// PY-7156
public void testFromPython33NamespacePackageImport() {
setLanguageLevel(LanguageLevel.PYTHON33);
try {
assertResolvesTo(PyFunction.class, "foo");
} finally {
setLanguageLevel(null);
}
}
private void prepareTestDirectory() {
final String testName = getTestName(true);
myFixture.copyDirectoryToProject(testName, "");