MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 11:50:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

Various class refactorings merge several "from imports" from abc module together

Browse Source
This commit is contained in:
Mikhail Golubev
2015-06-22 16:36:16 +03:00
parent 4237819376
commit 7e94358f1d
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
python/src/com/jetbrains/python/refactoring/classes/membersManager/MethodsManager.java
View File

@@ -26,6 +26,7 @@ import com.intellij.util.containers.MultiMap;
import com.jetbrains.NotNullPredicate;
import com.jetbrains.python.PyNames;
import com.jetbrains.python.codeInsight.imports.AddImportHelper;
import com.jetbrains.python.codeInsight.imports.AddImportHelper.ImportPriority;
import com.jetbrains.python.psi.*;
import com.jetbrains.python.psi.impl.PyFunctionBuilder;
import com.jetbrains.python.psi.types.PyType;
@@ -161,8 +162,7 @@ class MethodsManager extends MembersManager<PyFunction> {
* @param nameToImport what to import
*/
private static void addImportFromAbc(@NotNull final PsiFile file, @NotNull final String nameToImport) {
AddImportHelper.addFromImportStatement(file, ABC_META_PACKAGE, nameToImport, null,
AddImportHelper.ImportPriority.BUILTIN, null);
AddImportHelper.addOrUpdateFromImportStatement(file, ABC_META_PACKAGE, nameToImport, null, ImportPriority.BUILTIN, null);
}
/**

3
python/testData/refactoring/extractsuperclass/moveAndMakeAbstract/dest_module.after.py
View File

@@ -1,5 +1,4 @@
from abc import ABCMeta
from abc import abstractmethod
from abc import abstractmethod, ABCMeta
class NewParent(object):

3
python/testData/refactoring/pullup/abstractMethodPy2AddMeta/SuperClass.after.py
View File

@@ -1,5 +1,4 @@
from abc import ABCMeta
from abc import abstractmethod
from abc import abstractmethod, ABCMeta
class Parent(object):

6
python/testData/refactoring/pullup/abstractMethodPy3AddMeta/SuperClass.after.py
View File

@@ -1,6 +1,6 @@
from abc import ABCMeta
from abc import abstractmethod
from abc import object
from abc import object, abstractmethod, ABCMeta
class Parent(object, metaclass=ABCMeta):
@abstractmethod
def my_method(self, foo):