Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions rope/refactor/inline.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,16 @@ def __init__(self, *args, **kwds):
super().__init__(*args, **kwds)
self.pyfunction = self.pyname.get_object()
self.pymodule = self.pyfunction.get_module()
scope = self.pyfunction.parent.get_scope()
for decorator in self.pyfunction.decorators:
pyname = evaluate.eval_node(scope, decorator)
pyobject = pyname.get_object() if pyname is not None else None
if (
isinstance(pyobject, pyobjects.PyFunction)
and pyobject.get_name() == "abstractmethod"
and pyobject.get_module().get_name() == "abc"
):
raise exceptions.RefactoringError("Cannot inline an abstract method.")
self.resource = self.pyfunction.get_module().get_resource()
self.occurrence_finder = occurrences.create_finder(
self.project, self.name, self.pyname
Expand Down
34 changes: 34 additions & 0 deletions ropetest/refactor/inlinetest.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,40 @@ def test_simple_case(self):
refactored = self._inline(code, code.index("a_var") + 1)
self.assertEqual("another_var = 10\n", refactored)

def test_refuses_abstract_method_inlining(self):
for import_line, decorator in [
("from abc import abstractmethod", "abstractmethod"),
("import abc", "abc.abstractmethod"),
("from abc import abstractmethod as abstract", "abstract"),
]:
with self.subTest(decorator=decorator):
code = (
import_line + "\nclass Base:\n"
" @" + decorator + "\n"
" def method(self):\n return 1\n"
"Base().method()\n"
)
for offset in [code.index("def method") + 5, code.rindex("method")]:
self.mod.write(code)
with self.assertRaisesRegex(
rope.base.exceptions.RefactoringError, "abstract method"
):
inline.create_inline(self.project, self.mod, offset)
self.assertEqual(self.mod.read(), code)

def test_same_named_custom_decorator_is_not_abstract(self):
code = dedent("""\
def abstractmethod(func):
return func
class Base:
@abstractmethod
def method(self):
return 1
result = Base().method()
""")
refactored = self._inline(code, code.index("def method") + 5)
self.assertIn("result = 1", refactored)

def test_empty_case(self):
code = "a_var = 10\n"
refactored = self._inline(code, code.index("a_var") + 1)
Expand Down
Loading