diff -r 5c470b412f2f -r a29c3d2e6dc0 RefactoringRope/Refactoring.py
--- a/RefactoringRope/Refactoring.py Sun Apr 14 15:14:16 2013 +0200
+++ b/RefactoringRope/Refactoring.py Tue Aug 13 21:13:02 2013 +0200
@@ -7,10 +7,19 @@
Module implementing the refactoring interface to rope.
"""
+from __future__ import unicode_literals # __IGNORE_WARNING__
+
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
+
+sys.path.insert(0, path)
import rope
import rope.base.libutils
import rope.base.exceptions
@@ -688,9 +697,6 @@
self.updateConfigAct.triggered[()].connect(
self.__updateConfig)
self.actions.append(self.updateConfigAct)
-
- for act in self.actions:
- act.setEnabled(False)
def initMenu(self):
"""
@@ -2034,8 +2040,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)
@@ -2129,20 +2139,14 @@
self.__projectpath = self.__e5project.getProjectPath()
self.__projectLanguage = self.__e5project.getProjectLanguage()
- if self.__projectLanguage in ["Python3"]:
- import rope.base.project
- self.__project = rope.base.project.Project(self.__projectpath,
- fscommands=self.__fsCommands)
- for act in self.actions:
- act.setEnabled(True)
+ import rope.base.project
+ self.__project = rope.base.project.Project(self.__projectpath,
+ fscommands=self.__fsCommands)
def projectClosed(self):
"""
Public slot to handle the projectClosed signal.
"""
- for act in self.actions:
- act.setEnabled(False)
-
if self.__project is not None:
self.__project.close()
self.__project = None
