Mercurial Repositories > Rope Refactoring / file diff

--- a/RefactoringRope/Refactoring.py	Sat Apr 12 19:48:00 2014 +0200
+++ b/RefactoringRope/Refactoring.py	Fri May 02 21:06:07 2014 +0200
@@ -7,10 +7,19 @@
 Module implementing the refactoring interface to rope.
 """
 
+from __future__ import unicode_literals
+
 import os
 import sys
 
 sys.path.insert(0, os.path.dirname(__file__))
+if sys.version_info[0] >= 3:
+    path = os.path.join(os.path.dirname(__file__), 'rope_py3')
+else:
+    path = os.path.join(os.path.dirname(__file__), 'rope_py2')
+    str = unicode   # __IGNORE_WARNING__
+sys.path.insert(0, path)
+
 import rope
 import rope.base.libutils
 import rope.base.exceptions
@@ -2082,8 +2091,12 @@
         """
         if self.__helpDialog is None:
             from HelpDialog import HelpDialog
+            if sys.version_info[0] >= 3:
+                dir = 'rope_py3'
+            else:
+                dir = 'rope_py2'
             helpfile = os.path.join(os.path.dirname(__file__),
-                                    "rope", "docs", "overview.txt")
+                                    dir, "rope", "docs", "overview.txt")
             self.__helpDialog = \
                 HelpDialog(self.trUtf8("Help about rope refactorings"),
                            helpfile)
@@ -2179,7 +2192,7 @@
         self.__projectpath = self.__e5project.getProjectPath()
         self.__projectLanguage = self.__e5project.getProjectLanguage()
         
-        if self.__projectLanguage in ["Python3"]:
+        if self.__projectLanguage.startswith("Python"):
             import rope.base.project
             self.__project = rope.base.project.Project(
                 self.__projectpath, fscommands=self.__fsCommands)