Mercurial Repositories > Rope Refactoring / file diff

--- a/RefactoringRope/RefactoringClient.py	Wed May 26 17:53:08 2021 +0200
+++ b/RefactoringRope/RefactoringClient.py	Wed May 26 19:07:42 2021 +0200
@@ -22,14 +22,10 @@
 
 from ProgressHandle import ProgressHandle
 
-try:
-    from eric6.E5Network.E5JsonClient import E5JsonClient
-except ImportError:
-    # TODO: delete JsonClient once ported to eric7
-    from JsonClient import JsonClient as E5JsonClient
+from eric7.EricNetwork.EricJsonClient import EricJsonClient
 
 
-class RefactoringClient(E5JsonClient):
+class RefactoringClient(EricJsonClient):
     """
     Class implementing the refactoring client interface to rope.
     """
@@ -185,7 +181,7 @@
             "RopeFolderName": self.__project.ropefolder.real_path,
             "DefaultConfig": self.__project._default_config(),
             "RopeHelpFile": os.path.join(
-                os.path.dirname(__file__), "rope", "docs", "overview.rst"),
+                os.path.dirname(__file__), "Documentation", "rope", "overview.rst"),
             "RopeInfo": rope.INFO,
             "RopeVersion": rope.VERSION,
             "RopeCopyright": rope.COPYRIGHT,
@@ -1510,10 +1506,10 @@
     
     host, port, projectPath = sys.argv[1:-1]
     
-    # Create a Qt5 application object in order to allow the processing of
+    # Create a Qt6 application object in order to allow the processing of
     # modules containing Qt stuff.
     try:
-        from PyQt5.QtCore import QCoreApplication
+        from PyQt6.QtCore import QCoreApplication
     except ImportError:
         QCoreApplication = None
     if QCoreApplication is not None: