Merge pull request #785 from python-rope/lieryan-refactor-movetest

Refactor movetest.py

Author: lieryan

CHANGELOG.md

@@ -1,5 +1,9 @@
 # **Upcoming release**
 
+- #785 Refactoring movetest.py (@lieryan)
+
+# Release 1.13.0
+
 - #781, #783 Isolate tests that uses external_fixturepkg into a venv (@lieryan)
 - #751 Check for ast.Attributes when finding occurrences in fstrings (@sandratsy)
 - #777, #698 add validation to refuse Rename refactoring to a python keyword (@lieryan)

pyproject.toml

@@ -75,14 +75,20 @@ packages = [
 
 [tool.black]
 target-version = [
-    'py36',
-    'py37',
     'py38',
     'py39',
+    'py310',
+    'py311',
+    'py312',
 ]
 include = 'rope/.*\.pyi?$'
 force-exclude = 'ropetest|rope/base/prefs.py'
 
+[tool.coverage.report]
+exclude_also = [
+    "if TYPE_CHECKING:",
+]
+
 [tool.isort]
 profile = "black"
 

rope/contrib/generate.py

@@ -18,7 +18,7 @@
     from typing import Literal, Optional
 
     from rope.base.project import Project
-    from rope.base.resources import Resource
+    from rope.base.resources import Resource, File, Folder
 
     GenerateKind = Literal[
         "variable",
@@ -51,7 +51,7 @@ def create_generate(
     return generate(project, resource, offset, goal_resource=goal_resource)
 
 
-def create_module(project, name, sourcefolder=None):
+def create_module(project, name, sourcefolder=None) -> File:
     """Creates a module and returns a `rope.base.resources.File`"""
     if sourcefolder is None:
         sourcefolder = project.root
@@ -62,7 +62,7 @@ def create_module(project, name, sourcefolder=None):
     return parent.create_file(packages[-1] + ".py")
 
 
-def create_package(project, name, sourcefolder=None):
+def create_package(project, name, sourcefolder=None) -> Folder:
     """Creates a package and returns a `rope.base.resources.Folder`"""
     if sourcefolder is None:
         sourcefolder = project.root

rope/refactor/move.py

@@ -82,9 +82,9 @@ def __init__(self, project, resource, offset):
 
     def get_changes(
         self,
-        dest_attr,
-        new_name=None,
-        resources=None,
+        dest_attr: str,
+        new_name: Optional[str] = None,
+        resources: Optional[List[resources.File]] = None,
         task_handle=taskhandle.DEFAULT_TASK_HANDLE,  # FIXME: this is unused
     ):
         """Return the changes needed for this refactoring
@@ -335,7 +335,7 @@ def get_changes(
         # "Resource" has no attribute "has_child"
         if dest is None or not dest.exists():
             raise exceptions.RefactoringError("Move destination does not exist.")
-        if dest.is_folder() and dest.has_child("__init__.py"):  # type:ignore
+        if dest.is_folder() and dest.has_child("__init__.py"):  # type: ignore[attr-defined]
             dest = dest.get_child("__init__.py")  # type:ignore
         # The previous guards protect against this mypy complaint:
         # Item "None" of "Union[str, Resource, None]" has no attribute "is_folder"
@@ -519,7 +519,10 @@ def __init__(self, project, resource):
         self.import_tools = self.tools.import_tools
 
     def get_changes(
-        self, dest, resources=None, task_handle=taskhandle.DEFAULT_TASK_HANDLE
+        self,
+        dest: resources.Resource,
+        resources: Optional[List[resources.File]] = None,
+        task_handle=taskhandle.DEFAULT_TASK_HANDLE,
     ):
         if resources is None:
             resources = self.project.get_python_files()