diff --git a/python/testData/refactoring/pullup/abstractMethodPy2AddMeta/abc.py b/python/testData/MockSdk2.7/Lib/abc.py similarity index 100% rename from python/testData/refactoring/pullup/abstractMethodPy2AddMeta/abc.py rename to python/testData/MockSdk2.7/Lib/abc.py diff --git a/python/testData/refactoring/pullup/abstractMethodPy3AddMeta/abc.py b/python/testData/MockSdk3.2/Lib/abc.py similarity index 100% rename from python/testData/refactoring/pullup/abstractMethodPy3AddMeta/abc.py rename to python/testData/MockSdk3.2/Lib/abc.py diff --git a/python/testData/MockSdk3.4/Lib/abc.py b/python/testData/MockSdk3.4/Lib/abc.py new file mode 100644 index 000000000000..a63732d230a2 --- /dev/null +++ b/python/testData/MockSdk3.4/Lib/abc.py @@ -0,0 +1,11 @@ +# Stubs + +class object: + pass + +class ABCMeta: + pass + + +def abstractmethod(foo): + pass \ No newline at end of file diff --git a/python/testData/refactoring/pullup/abstractMethodPy2AddMeta/SuperClass.after.py b/python/testData/refactoring/pullup/abstractMethodPy2AddMeta/SuperClass.after.py index d44a9e409086..caebaa8dd218 100644 --- a/python/testData/refactoring/pullup/abstractMethodPy2AddMeta/SuperClass.after.py +++ b/python/testData/refactoring/pullup/abstractMethodPy2AddMeta/SuperClass.after.py @@ -1,5 +1,5 @@ -from abc import ABCMeta from abc import abstractmethod +from abc import ABCMeta class Parent(object): diff --git a/python/testData/refactoring/pullup/abstractMethodPy3AddMeta/SuperClass.after.py b/python/testData/refactoring/pullup/abstractMethodPy3AddMeta/SuperClass.after.py index ded9ea669c57..b2122bd3b0ce 100644 --- a/python/testData/refactoring/pullup/abstractMethodPy3AddMeta/SuperClass.after.py +++ b/python/testData/refactoring/pullup/abstractMethodPy3AddMeta/SuperClass.after.py @@ -1,6 +1,8 @@ -from abc import ABCMeta -from abc import abstractmethod from abc import object +from abc import abstractmethod +from abc import ABCMeta + + class Parent(object, metaclass=ABCMeta): @abstractmethod def my_method(self, foo): diff --git a/python/testSrc/com/jetbrains/python/refactoring/classes/pullUp/PyPullUpTest.java b/python/testSrc/com/jetbrains/python/refactoring/classes/pullUp/PyPullUpTest.java index fbf568807e40..aa652590dc29 100644 --- a/python/testSrc/com/jetbrains/python/refactoring/classes/pullUp/PyPullUpTest.java +++ b/python/testSrc/com/jetbrains/python/refactoring/classes/pullUp/PyPullUpTest.java @@ -15,7 +15,6 @@ */ package com.jetbrains.python.refactoring.classes.pullUp; -import com.intellij.util.ArrayUtil; import com.jetbrains.python.psi.LanguageLevel; import com.jetbrains.python.psi.PyClass; import com.jetbrains.python.psi.PyElement; @@ -147,7 +146,7 @@ public class PyPullUpTest extends PyClassRefactoringTest { */ private void checkAbstract(@NotNull final String... methodNames) { final String[] modules = {"Class", "SuperClass"}; - configureMultiFile(ArrayUtil.mergeArrays(modules, "abc")); + configureMultiFile(modules); doPullUp("Child", "Parent", true, methodNames); checkMultiFile(modules); }