Mercurial Repositories > Rope Refactoring / file diff

--- a/RefactoringRope/CodeAssistClient.py	Mon May 10 20:14:08 2021 +0200
+++ b/RefactoringRope/CodeAssistClient.py	Tue May 11 19:31:36 2021 +0200
@@ -10,8 +10,19 @@
 import sys
 import contextlib
 
+modulePath = sys.argv[-1]   # it is always the last parameter
+sys.path.insert(1, modulePath)
+
 try:
-    from E5Network.E5JsonClient import E5JsonClient
+    import rope.base.project
+    import rope.base.libutils
+    import rope.contrib.codeassist
+    from rope.base.exceptions import BadIdentifierError, ModuleSyntaxError
+except ImportError:
+    sys.exit(42)
+
+try:
+    from eric6.E5Network.E5JsonClient import E5JsonClient
 except ImportError:
     # TODO: delete JsonClient once ported to eric7
     from JsonClient import JsonClient as E5JsonClient
@@ -440,16 +451,7 @@
               ' missing. Abort.')
         sys.exit(1)
     
-    host, port, idString, projectPath, modulePath = sys.argv[1:]
-    
-    sys.path.insert(1, modulePath)
-    try:
-        import rope.base.project
-        import rope.base.libutils
-        import rope.contrib.codeassist
-        from rope.base.exceptions import BadIdentifierError, ModuleSyntaxError
-    except ImportError:
-        sys.exit(42)
+    host, port, idString, projectPath = sys.argv[1:-1]
     
     # Create a Qt5 application object in order to allow the processing of
     # modules containing Qt stuff.