diff -r 6fa5892b9097 -r a4cba20ad7ab RefactoringRope/RefactoringClient.py
--- a/RefactoringRope/RefactoringClient.py Sat Dec 23 15:48:55 2023 +0100
+++ b/RefactoringRope/RefactoringClient.py Sat Dec 23 17:58:35 2023 +0100
@@ -10,6 +10,7 @@
import contextlib
import os
import sys
+import traceback
modulePath = sys.argv[-1] # it is always the last parameter
sys.path.append(modulePath)
@@ -17,6 +18,22 @@
try:
import rope.base.libutils
import rope.base.project
+ import rope.contrib.findit
+ import rope.refactor.change_signature
+ import rope.refactor.encapsulate_field
+ import rope.refactor.extract
+ import rope.refactor.inline
+ import rope.refactor.introduce_factory
+ import rope.refactor.introduce_parameter
+ import rope.refactor.localtofield
+ import rope.refactor.method_object
+ import rope.refactor.move
+ import rope.refactor.rename
+ import rope.refactor.restructure
+ import rope.refactor.topackage
+ import rope.refactor.usefunction
+
+ from rope.refactor.importutils import ImportOrganizer
except ImportError:
sys.exit(42)
@@ -41,6 +58,8 @@
@param projectPath path to the project
@type str
"""
+ from FileSystemCommands import RefactoringClientFileSystemCommands # noqa: I102
+
super().__init__(host, port)
self.__methodMapping = {
@@ -87,8 +106,6 @@
"CalculateMethodObjectChanges": self.__calculateMethodObjectChanges,
}
- from FileSystemCommands import RefactoringClientFileSystemCommands
-
self.__fsCommands = RefactoringClientFileSystemCommands(self)
self.__projectpath = projectPath
@@ -121,8 +138,6 @@
@return dictionary containing the error information
@rtype dict
"""
- import traceback
-
tb = traceback.format_tb(sys.exc_info()[2])
ropeError = str(type(err)).split()[-1]
ropeError = ropeError[1:-2].split(".")[-1]
@@ -137,7 +152,7 @@
return errorDict
- def __abortAction(self, params):
+ def __abortAction(self, params): # noqa: U100
"""
Private method to abort the current action.
@@ -148,7 +163,7 @@
if self.__progressHandle is not None and not self.__progressHandle.is_stopped():
self.__progressHandle.stop()
- def __validate(self, params):
+ def __validate(self, params): # noqa: U100
"""
Private slot to validate the project.
@@ -158,7 +173,7 @@
"""
self.__project.validate(self.__project.root)
- def __closeProject(self, params):
+ def __closeProject(self, params): # noqa: U100
"""
Private slot to validate the project.
@@ -168,7 +183,7 @@
"""
self.__project.close()
- def __getConfig(self, params):
+ def __getConfig(self, params): # noqa: U100
"""
Private method to send some configuration data to the server.
@@ -202,7 +217,7 @@
self.sendJson("Config", result)
- def __configChanged(self, params):
+ def __configChanged(self, params): # noqa: U100
"""
Private method to handle a change of the configuration file.
@@ -230,8 +245,6 @@
errorDict = {}
occurrences = []
- import rope.contrib.findit
-
resource = rope.base.libutils.path_to_resource(self.__project, filename)
self.__progressHandle = ProgressHandle(self, title, True)
try:
@@ -276,8 +289,6 @@
errorDict = {}
location = None
- import rope.contrib.findit
-
resource = rope.base.libutils.path_to_resource(self.__project, filename)
try:
location = rope.contrib.findit.find_definition(
@@ -310,8 +321,6 @@
errorDict = {}
occurrences = []
- import rope.contrib.findit
-
resource = rope.base.libutils.path_to_resource(self.__project, filename)
self.__progressHandle = ProgressHandle(self, title, True)
try:
@@ -559,8 +568,6 @@
"Title": title,
}
- import rope.refactor.rename
-
resource = rope.base.libutils.path_to_resource(self.__project, filename)
resources = [resource] if isLocal else None
@@ -642,8 +649,6 @@
"Title": title,
}
- import rope.refactor.rename
-
resource = rope.base.libutils.path_to_resource(self.__project, filename)
try:
renamer = rope.refactor.rename.ChangeOccurrences(
@@ -689,8 +694,6 @@
"Title": title,
}
- import rope.refactor.extract
-
resource = rope.base.libutils.path_to_resource(self.__project, filename)
try:
if kind not in ("variable", "method"):
@@ -735,8 +738,6 @@
"Title": title,
}
- import rope.refactor.inline
-
resource = rope.base.libutils.path_to_resource(self.__project, filename)
try:
inliner = rope.refactor.inline.create_inline(
@@ -777,8 +778,6 @@
"Title": title,
}
- import rope.refactor.extract
-
resource = rope.base.libutils.path_to_resource(self.__project, filename)
self.__progressHandle = ProgressHandle(self, title, True)
try:
@@ -829,8 +828,6 @@
"Title": title,
}
- import rope.refactor.move
-
resource = rope.base.libutils.path_to_resource(self.__project, filename)
try:
mover = rope.refactor.move.create_move(self.__project, resource, offset)
@@ -880,8 +877,6 @@
"Title": title,
}
- import rope.refactor.move
-
resource = rope.base.libutils.path_to_resource(self.__project, filename)
self.__progressHandle = ProgressHandle(self, title, True)
try:
@@ -934,8 +929,6 @@
"Title": title,
}
- import rope.refactor.usefunction
-
resource = rope.base.libutils.path_to_resource(self.__project, filename)
try:
user = rope.refactor.usefunction.UseFunction(
@@ -970,8 +963,6 @@
"Title": title,
}
- import rope.refactor.usefunction
-
resource = rope.base.libutils.path_to_resource(self.__project, filename)
self.__progressHandle = ProgressHandle(self, title, True)
try:
@@ -1014,8 +1005,6 @@
"Title": title,
}
- import rope.refactor.introduce_factory
-
resource = rope.base.libutils.path_to_resource(self.__project, filename)
self.__progressHandle = ProgressHandle(self, title, True)
try:
@@ -1061,8 +1050,6 @@
"Title": title,
}
- import rope.refactor.introduce_parameter
-
resource = rope.base.libutils.path_to_resource(self.__project, filename)
try:
introducer = rope.refactor.introduce_parameter.IntroduceParameter(
@@ -1101,8 +1088,6 @@
"Title": title,
}
- from rope.refactor.importutils import ImportOrganizer
-
method = {
"organize_imports": ImportOrganizer.organize_imports,
"expand_star_imports": ImportOrganizer.expand_star_imports,
@@ -1159,8 +1144,6 @@
"Title": title,
}
- import rope.refactor.restructure
-
self.__project.validate(self.__project.root)
self.__progressHandle = ProgressHandle(self, title, True)
try:
@@ -1201,8 +1184,6 @@
"Title": title,
}
- import rope.refactor.change_signature
-
resource = rope.base.libutils.path_to_resource(self.__project, filename)
try:
changer = rope.refactor.change_signature.ChangeSignature(
@@ -1243,7 +1224,6 @@
}
changers = []
- import rope.refactor.change_signature
# removals
for index in removals:
@@ -1347,8 +1327,6 @@
"Title": title,
}
- import rope.refactor.topackage
-
resource = rope.base.libutils.path_to_resource(self.__project, filename)
try:
changes = rope.refactor.topackage.ModuleToPackage(
@@ -1397,8 +1375,6 @@
"Title": title,
}
- import rope.refactor.encapsulate_field
-
resource = rope.base.libutils.path_to_resource(self.__project, filename)
try:
encapsulateField = rope.refactor.encapsulate_field.EncapsulateField(
@@ -1435,8 +1411,6 @@
"Title": title,
}
- import rope.refactor.encapsulate_field
-
resource = rope.base.libutils.path_to_resource(self.__project, filename)
self.__progressHandle = ProgressHandle(self, title, True)
try:
@@ -1479,8 +1453,6 @@
"Title": title,
}
- import rope.refactor.localtofield
-
resource = rope.base.libutils.path_to_resource(self.__project, filename)
try:
changes = rope.refactor.localtofield.LocalToField(
@@ -1530,8 +1502,6 @@
"Title": title,
}
- import rope.refactor.method_object
-
resource = rope.base.libutils.path_to_resource(self.__project, filename)
try:
converter = rope.refactor.method_object.MethodObject(
@@ -1551,9 +1521,7 @@
if __name__ == "__main__":
if len(sys.argv) != 5:
- print(
- "Host, port, project path and module path parameters are" " missing. Abort."
- )
+ print("Host, port, project path and module path parameters are missing. Abort.")
sys.exit(1)
host, port, projectPath = sys.argv[1:-1]
