Rope Refactoring: comparison RefactoringRope/Refactoring.py

-:32dd7dbf3e8e
+:83b71483e198
 #####################################################
 ## Rename refactoring actions
 #####################################################
 self.refactoringRenameAct = E5Action(self.trUtf8('Rename'),
 self.trUtf8('&Rename'),
 0, 0,
-self,'refactoring_rename')
+self, 'refactoring_rename')
 self.refactoringRenameAct.setStatusTip(self.trUtf8(
 'Rename the highlighted object'))
 self.refactoringRenameAct.setWhatsThis(self.trUtf8(
 """<b>Rename</b>"""
 """<p>Rename the highlighted Python object.</p>"""
 self.refactoringRenameAct.triggered[()].connect(
 self.__rename)
 self.actions.append(self.refactoringRenameAct)
 self.refactoringRenameLocalAct = E5Action(self.trUtf8('Local Rename'),
 self.trUtf8('&Local Rename'),
 0, 0,
-self,'refactoring_rename_local')
+self, 'refactoring_rename_local')
 self.refactoringRenameLocalAct.setStatusTip(self.trUtf8(
 'Rename the highlighted object in the current module only'))
 self.refactoringRenameLocalAct.setWhatsThis(self.trUtf8(
 """<b>Local Rename</b>"""
 """<p>Rename the highlighted Python object in the current"""
 self.__renameLocal)
 self.actions.append(self.refactoringRenameLocalAct)
 self.refactoringRenameModuleAct = E5Action(
 self.trUtf8('Rename Current Module'),
 self.trUtf8('Rename Current Module'),
 0, 0,
-self,'refactoring_rename_module')
+self, 'refactoring_rename_module')
 self.refactoringRenameModuleAct.setStatusTip(self.trUtf8(
 'Rename the current module'))
 self.refactoringRenameModuleAct.setWhatsThis(self.trUtf8(
 """<b>Rename Current Module</b>"""
 """<p>Rename the current module.</p>"""
 self.__renameModule)
 self.actions.append(self.refactoringRenameModuleAct)
 self.refactoringChangeOccurrencesAct = E5Action(
 self.trUtf8('Change Occurrences'),
 self.trUtf8('Change &Occurrences'),
 0, 0,
-self,'refactoring_change_occurrences')
+self, 'refactoring_change_occurrences')
 self.refactoringChangeOccurrencesAct.setStatusTip(self.trUtf8(
 'Change all occurrences in the local scope'))
 self.refactoringChangeOccurrencesAct.setWhatsThis(self.trUtf8(
 """<b>Change Occurrences</b>"""
 """<p>Change all occurrences in the local scope.</p>"""
 self.refactoringExtractMethodAct = E5Action(
 self.trUtf8('Extract method'),
 self.trUtf8('Extract &Method'),
 0, 0,
-self,'refactoring_extract_method')
+self, 'refactoring_extract_method')
 self.refactoringExtractMethodAct.setStatusTip(self.trUtf8(
 'Extract the highlighted area as a method'))
 self.refactoringExtractMethodAct.setWhatsThis(self.trUtf8(
 """<b>Extract method</b>"""
 """<p>Extract the highlighted area as a method or function.</p>"""
 self.refactoringExtractLocalVariableAct = E5Action(
 self.trUtf8('Extract local variable'),
 self.trUtf8('&Extract Local Variable'),
 0, 0,
-self,'refactoring_extract_variable')
+self, 'refactoring_extract_variable')
 self.refactoringExtractLocalVariableAct.setStatusTip(self.trUtf8(
 'Extract the highlighted area as a local variable'))
 self.refactoringExtractLocalVariableAct.setWhatsThis(self.trUtf8(
 """<b>Extract local variable</b>"""
 """<p>Extract the highlighted area as a local variable.</p>"""
 self.refactoringInlineAct = E5Action(
 self.trUtf8('Inline'),
 self.trUtf8('&Inline'),
 0, 0,
-self,'refactoring_inline')
+self, 'refactoring_inline')
 self.refactoringInlineAct.setStatusTip(self.trUtf8(
 'Inlines the selected local variable or method'))
 self.refactoringInlineAct.setWhatsThis(self.trUtf8(
 """<b>Inline</b>"""
 """<p>Inlines the selected local variable or method.</p>"""
 self.refactoringMoveMethodAct = E5Action(
 self.trUtf8('Move method'),
 self.trUtf8('Mo&ve Method'),
 0, 0,
-self,'refactoring_move_method')
+self, 'refactoring_move_method')
 self.refactoringMoveMethodAct.setStatusTip(self.trUtf8(
 'Move the highlighted method to another class'))
 self.refactoringMoveMethodAct.setWhatsThis(self.trUtf8(
 """<b>Move method</b>"""
 """<p>Move the highlighted method to another class.</p>"""
 self.refactoringMoveModuleAct = E5Action(
 self.trUtf8('Move current module'),
 self.trUtf8('Move Current Module'),
 0, 0,
-self,'refactoring_move_module')
+self, 'refactoring_move_module')
 self.refactoringMoveModuleAct.setStatusTip(self.trUtf8(
 'Move the current module to another package'))
 self.refactoringMoveModuleAct.setWhatsThis(self.trUtf8(
 """<b>Move current module</b>"""
 """<p>Move the current module to another package.</p>"""
 self.refactoringUseFunctionAct = E5Action(
 self.trUtf8('Use Function'),
 self.trUtf8('Use Function'),
 0, 0,
-self,'refactoring_use_function')
+self, 'refactoring_use_function')
 self.refactoringUseFunctionAct.setStatusTip(self.trUtf8(
 'Use a function wherever possible.'))
 self.refactoringUseFunctionAct.setWhatsThis(self.trUtf8(
 """<b>Use function</b>"""
 """<p>Tries to use a function wherever possible.</p>"""
 self.refactoringIntroduceFactoryAct = E5Action(
 self.trUtf8('Introduce Factory Method'),
 self.trUtf8('Introduce &Factory Method'),
 0, 0,
-self,'refactoring_introduce_factory_method')
+self, 'refactoring_introduce_factory_method')
 self.refactoringIntroduceFactoryAct.setStatusTip(self.trUtf8(
 'Introduce a factory method or function'))
 self.refactoringIntroduceFactoryAct.setWhatsThis(self.trUtf8(
 """<b>Introduce Factory Method</b>"""
 """<p>Introduce a factory method or function.</p>"""
 self.refactoringIntroduceParameterAct = E5Action(
 self.trUtf8('Introduce Parameter'),
 self.trUtf8('Introduce &Parameter'),
 0, 0,
-self,'refactoring_introduce_parameter_method')
+self, 'refactoring_introduce_parameter_method')
 self.refactoringIntroduceParameterAct.setStatusTip(self.trUtf8(
 'Introduce a parameter in a function'))
 self.refactoringIntroduceParameterAct.setWhatsThis(self.trUtf8(
 """<b>Introduce Parameter</b>"""
 """<p>Introduce a parameter in a function.</p>"""
 self.refactoringImportsOrganizeAct = E5Action(
 self.trUtf8('Organize Imports'),
 self.trUtf8('&Organize Imports'),
 0, 0,
-self,'refactoring_organize_imports')
+self, 'refactoring_organize_imports')
 self.refactoringImportsOrganizeAct.setStatusTip(self.trUtf8(
 'Sort imports according to PEP-8'))
 self.refactoringImportsOrganizeAct.setWhatsThis(self.trUtf8(
 """<b>Organize Imports</b>"""
 """<p>Sort imports according to PEP-8.</p>"""
 self.refactoringImportsStarExpandAct = E5Action(
 self.trUtf8('Expand Star Imports'),
 self.trUtf8('E&xpand Star Imports'),
 0, 0,
-self,'refactoring_expand_star_imports')
+self, 'refactoring_expand_star_imports')
 self.refactoringImportsStarExpandAct.setStatusTip(self.trUtf8(
 'Expand imports like "from xxx import *"'))
 self.refactoringImportsStarExpandAct.setWhatsThis(self.trUtf8(
 """<b>Expand Star Imports</b>"""
 """<p>Expand imports like "from xxx import *".</p>"""
 self.refactoringImportsRelativeToAbsoluteAct = E5Action(
 self.trUtf8('Relative to Absolute'),
 self.trUtf8('Relative to &Absolute'),
 0, 0,
-self,'refactoring_relative_to_absolute_imports')
+self, 'refactoring_relative_to_absolute_imports')
 self.refactoringImportsRelativeToAbsoluteAct.setStatusTip(self.trUtf8(
 'Transform relative imports to absolute ones'))
 self.refactoringImportsRelativeToAbsoluteAct.setWhatsThis(self.trUtf8(
 """<b>Relative to Absolute</b>"""
 """<p>Transform relative imports to absolute ones.</p>"""
 self.refactoringImportsFromsToImportsAct = E5Action(
 self.trUtf8('Froms to Imports'),
 self.trUtf8('Froms to &Imports'),
 0, 0,
-self,'refactoring_froms_to_imports')
+self, 'refactoring_froms_to_imports')
 self.refactoringImportsFromsToImportsAct.setStatusTip(self.trUtf8(
 'Transform From imports to plain imports'))
 self.refactoringImportsFromsToImportsAct.setWhatsThis(self.trUtf8(
 """<b>Froms to Imports</b>"""
 """<p>Transform From imports to plain imports.</p>"""
 self.refactoringImportsHandleLongAct = E5Action(
 self.trUtf8('Handle Long Imports'),
 self.trUtf8('Handle &Long Imports'),
 0, 0,
-self,'refactoring_organize_imports')
+self, 'refactoring_organize_imports')
 self.refactoringImportsHandleLongAct.setStatusTip(self.trUtf8(
 'Transform long import statements to look better'))
 self.refactoringImportsHandleLongAct.setWhatsThis(self.trUtf8(
 """<b>Handle Long Imports</b>"""
 """<p>Transform long import statements to look better.</p>"""
 self.refactoringRestructureAct = E5Action(
 self.trUtf8('Restructure'),
 self.trUtf8('Res&tructure'),
 0, 0,
-self,'refactoring_restructure')
+self, 'refactoring_restructure')
 self.refactoringRestructureAct.setStatusTip(self.trUtf8(
 'Restructure code'))
 self.refactoringRestructureAct.setWhatsThis(self.trUtf8(
 """<b>Restructure</b>"""
 """<p>Restructure code. See "Rope Help" for examples.</p>"""
 self.refactoringChangeSignatureAct = E5Action(
 self.trUtf8('Change Method Signature'),
 self.trUtf8('&Change Method Signature'),
 0, 0,
-self,'refactoring_change_method_signature')
+self, 'refactoring_change_method_signature')
 self.refactoringChangeSignatureAct.setStatusTip(self.trUtf8(
 'Change the signature of the selected method or function'))
 self.refactoringChangeSignatureAct.setWhatsThis(self.trUtf8(
 """<b>Change Method Signature</b>"""
 """<p>Change the signature of the selected method"""
 self.refactoringInlineArgumentDefaultAct = E5Action(
 self.trUtf8('Inline Argument Default'),
 self.trUtf8('Inline &Argument Default'),
 0, 0,
-self,'refactoring_inline_argument_default')
+self, 'refactoring_inline_argument_default')
 self.refactoringInlineArgumentDefaultAct.setStatusTip(self.trUtf8(
 'Inline a parameters default value'))
 self.refactoringInlineArgumentDefaultAct.setWhatsThis(self.trUtf8(
 """<b>Inline Argument Default</b>"""
 """<p>Inline a parameters default value.</p>"""
 self.refactoringTransformModuleAct = E5Action(
 self.trUtf8('Transform Module to Package'),
 self.trUtf8('Transform Module to Package'),
 0, 0,
-self,'refactoring_transform_module_to_package')
+self, 'refactoring_transform_module_to_package')
 self.refactoringTransformModuleAct.setStatusTip(self.trUtf8(
 'Transform the current module to a package'))
 self.refactoringTransformModuleAct.setWhatsThis(self.trUtf8(
 """<b>Transform Module to Package</b>"""
 """<p>Transform the current module to a package.</p>"""
 self.refactoringEncapsulateAttributeAct = E5Action(
 self.trUtf8('Encapsulate Attribute'),
 self.trUtf8('Encap&sulate Attribute'),
 0, 0,
-self,'refactoring_encapsulate_attribute')
+self, 'refactoring_encapsulate_attribute')
 self.refactoringEncapsulateAttributeAct.setStatusTip(self.trUtf8(
 'Generate a getter/setter for an attribute'))
 self.refactoringEncapsulateAttributeAct.setWhatsThis(self.trUtf8(
 """<b>Encapsulate Attribute</b>"""
 """<p>Generate a getter/setter for an attribute and changes"""
 self.refactoringLocalVariableToAttributeAct = E5Action(
 self.trUtf8('Local Variable to Attribute'),
 self.trUtf8('Local Varia&ble to Attribute'),
 0, 0,
-self,'refactoring_local_variable_to_attribute')
+self, 'refactoring_local_variable_to_attribute')
 self.refactoringLocalVariableToAttributeAct.setStatusTip(self.trUtf8(
 'Change a local variable to an attribute'))
 self.refactoringLocalVariableToAttributeAct.setWhatsThis(self.trUtf8(
 """<b>Local Variable to Attribute</b>"""
 """<p>Change a local variable to an attribute.</p>"""
 self.refactoringMethodToMethodObjectAct = E5Action(
 self.trUtf8('Method To Method Object'),
 self.trUtf8('Method To Method Ob&ject'),
 0, 0,
-self,'refactoring_method_to_methodobject')
+self, 'refactoring_method_to_methodobject')
 self.refactoringMethodToMethodObjectAct.setStatusTip(self.trUtf8(
 'Transform a function or a method to a method object'))
 self.refactoringMethodToMethodObjectAct.setWhatsThis(self.trUtf8(
 """<b>Method To Method Object</b>"""
 """<p>Transform a function or a method to a method object.</p>"""
 #####################################################
 ## Undo/Redo actions
 #####################################################
 self.refactoringUndoAct = E5Action(self.trUtf8('Undo'),
 self.trUtf8('&Undo'),
 0, 0,
-self,'refactoring_undo')
+self, 'refactoring_undo')
 self.refactoringUndoAct.setStatusTip(self.trUtf8(
 'Undo the last refactoring'))
 self.refactoringUndoAct.setWhatsThis(self.trUtf8(
 """<b>Undo</b>"""
 """<p>Undo the last refactoring.</p>"""
 self.refactoringUndoAct.triggered[()].connect(
 self.__undo)
 self.actions.append(self.refactoringUndoAct)
 self.refactoringRedoAct = E5Action(self.trUtf8('Redo'),
 self.trUtf8('Re&do'),
 0, 0,
-self,'refactoring_redo')
+self, 'refactoring_redo')
 self.refactoringRedoAct.setStatusTip(self.trUtf8(
 'Redo the last refactoring'))
 self.refactoringRedoAct.setWhatsThis(self.trUtf8(
 """<b>Redo</b>"""
 """<p>Redo the last refactoring.</p>"""
 self.__redo)
 self.actions.append(self.refactoringRedoAct)
 self.refactoringUndoHistoryAct = \
 E5Action(self.trUtf8('Show Project Undo History'),
 self.trUtf8('Show Project Undo History'),
 0, 0,
-self,'refactoring_show_project_undo_history')
+self, 'refactoring_show_project_undo_history')
 self.refactoringUndoHistoryAct.setStatusTip(self.trUtf8(
 'Show the undo history of the project'))
 self.refactoringUndoHistoryAct.setWhatsThis(self.trUtf8(
 """<b>Show Project Undo History</b>"""
 """<p>Opens a dialog to show the undo history list of"""
 self.__showProjectUndoHistory)
 self.actions.append(self.refactoringUndoHistoryAct)
 self.refactoringRedoHistoryAct = \
 E5Action(self.trUtf8('Show Project Redo History'),
 self.trUtf8('Show Project Redo History'),
 0, 0,
-self,'refactoring_show_project_redo_history')
+self, 'refactoring_show_project_redo_history')
 self.refactoringRedoHistoryAct.setStatusTip(self.trUtf8(
 'Show the redo history of the project'))
 self.refactoringRedoHistoryAct.setWhatsThis(self.trUtf8(
 """<b>Show Project Redo History</b>"""
 """<p>Opens a dialog to show the redo history list of"""
 self.__showProjectRedoHistory)
 self.actions.append(self.refactoringRedoHistoryAct)
 self.refactoringUndoFileHistoryAct = \
 E5Action(self.trUtf8('Show Current File Undo History'),
 self.trUtf8('Show Current File Undo History'),
 0, 0,
-self,'refactoring_show_file_undo_history')
+self, 'refactoring_show_file_undo_history')
 self.refactoringUndoFileHistoryAct.setStatusTip(self.trUtf8(
 'Show the undo history of the current file'))
 self.refactoringUndoFileHistoryAct.setWhatsThis(self.trUtf8(
 """<b>Show Current File Undo History</b>"""
 """<p>Opens a dialog to show the undo history list of"""
 self.__showFileUndoHistory)
 self.actions.append(self.refactoringUndoFileHistoryAct)
 self.refactoringRedoFileHistoryAct = \
 E5Action(self.trUtf8('Show Current File Redo History'),
 self.trUtf8('Show Current File Redo History'),
 0, 0,
-self,'refactoring_show_file_redo_history')
+self, 'refactoring_show_file_redo_history')
 self.refactoringRedoFileHistoryAct.setStatusTip(self.trUtf8(
 'Show the redo history of the current file'))
 self.refactoringRedoFileHistoryAct.setWhatsThis(self.trUtf8(
 """<b>Show Current File Redo History</b>"""
 """<p>Opens a dialog to show the redo history list of"""
 self.__showFileRedoHistory)
 self.actions.append(self.refactoringRedoFileHistoryAct)
 self.refactoringClearHistoryAct = \
 E5Action(self.trUtf8('Clear History'),
 self.trUtf8('Clear History'),
 0, 0,
-self,'refactoring_clear_history')
+self, 'refactoring_clear_history')
 self.refactoringClearHistoryAct.setStatusTip(self.trUtf8(
 'Clear the refactoring history'))
 self.refactoringClearHistoryAct.setWhatsThis(self.trUtf8(
 """<b>Clear History</b>"""
 """<p>Clears the refactoring history.</p>"""
 #####################################################
 self.queryReferencesAct = E5Action(self.trUtf8('Find occurrences'),
 self.trUtf8('Find &Occurrences'),
 0, 0,
-self,'refactoring_find_occurrences')
+self, 'refactoring_find_occurrences')
 self.queryReferencesAct.setStatusTip(self.trUtf8(
 'Find occurrences of the highlighted object'))
 self.queryReferencesAct.setWhatsThis(self.trUtf8(
 """<b>Find occurrences</b>"""
 """<p>Find occurrences of the highlighted class, method,"""
 self.actions.append(self.queryReferencesAct)
 self.queryDefinitionAct = E5Action(self.trUtf8('Find definition'),
 self.trUtf8('Find &Definition'),
 0, 0,
-self,'refactoring_find_definition')
+self, 'refactoring_find_definition')
 self.queryDefinitionAct.setStatusTip(self.trUtf8(
 'Find definition of the highlighted item'))
 self.queryDefinitionAct.setWhatsThis(self.trUtf8(
 """<b>Find definition</b>"""
 """<p>Find the definition of the highlighted class, method,"""
 self.queryImplementationsAct = E5Action(
 self.trUtf8('Find implementations'),
 self.trUtf8('Find &Implementations'),
 0, 0,
-self,'refactoring_find_implementations')
+self, 'refactoring_find_implementations')
 self.queryImplementationsAct.setStatusTip(self.trUtf8(
 'Find places where the selected method is overridden'))
 self.queryImplementationsAct.setWhatsThis(self.trUtf8(
 """<b>Find implementations</b>"""
 """<p>Find places where the selected method is overridden.</p>"""
 #####################################################
 self.refactoringEditConfigAct = E5Action(self.trUtf8('Configure Rope'),
 self.trUtf8('&Configure Rope'),
 0, 0,
-self,'refactoring_edit_config')
+self, 'refactoring_edit_config')
 self.refactoringEditConfigAct.setStatusTip(self.trUtf8(
 'Open the rope configuration file'))
 self.refactoringEditConfigAct.setWhatsThis(self.trUtf8(
 """<b>Configure Rope</b>"""
 """<p>Opens the rope configuration file in an editor.</p>"""
 self.actions.append(self.refactoringEditConfigAct)
 self.refactoringHelpAct = E5Action(self.trUtf8('Rope help'),
 self.trUtf8('Rope &Help'),
 0, 0,
-self,'refactoring_help')
+self, 'refactoring_help')
 self.refactoringHelpAct.setStatusTip(self.trUtf8(
 'Show help about the rope refactorings'))
 self.refactoringHelpAct.setWhatsThis(self.trUtf8(
 """<b>Rope help</b>"""
 """<p>Show some help text about the rope refactorings.</p>"""
 self.refactoringAllSoaAct = E5Action(
 self.trUtf8('Analyse all modules'),
 self.trUtf8('&Analyse all modules'),
 0, 0,
-self,'refactoring_analyze_all')
+self, 'refactoring_analyze_all')
 self.refactoringAllSoaAct.setStatusTip(self.trUtf8(
 'Perform static object analysis on all modules'))
 self.refactoringAllSoaAct.setWhatsThis(self.trUtf8(
 """<b>Analyse all modules</b>"""
 """<p>Perform static object analysis (SOA) on all modules. """
 self.updateConfigAct = E5Action(
 self.trUtf8('Update Configuration'),
 self.trUtf8('&Update Configuration'),
 0, 0,
-self,'refactoring_update_configuration')
+self, 'refactoring_update_configuration')
 self.updateConfigAct.setStatusTip(self.trUtf8(
 'Generates a new configuration file overwriting the current one.'))
 self.updateConfigAct.setWhatsThis(self.trUtf8(
 """<b>Update Configuration</b>"""
 """<p>Generates a new configuration file overwriting"""
 smenu.addAction(self.refactoringUndoAct)
 smenu.addAction(self.refactoringRedoAct)
 smenu.addSeparator()
 hmenu = smenu.addMenu(self.trUtf8("History"))
 self.connect(hmenu, SIGNAL("aboutToShow()"),
 self.__showRefactoringHistoryMenu)
 hmenu.addAction(self.refactoringUndoHistoryAct)
 hmenu.addAction(self.refactoringUndoFileHistoryAct)
 hmenu.addSeparator()
 hmenu.addAction(self.refactoringRedoHistoryAct)
 if handle is not None:
 handle.reset()
 if str(type(err)).split()[-1][1:-2].split('.')[-1] == \
 'ModuleSyntaxError':
 res = QMessageBox.warning(self.__ui, title,
 self.trUtf8("Rope error: {0}").format(str(err)),
 QMessageBox.Ok | QMessageBox.Open)
 if res == QMessageBox.Open:
 e5App().getObject("ViewManager").openSourceFile(
 os.path.join(self.__e4project.getProjectPath(),
 err.filename),
 err.lineno)
 else:
 QMessageBox.warning(self.__ui, title,
 self.trUtf8("Rope error: {0}").format(str(err)))
 def __renameModule(self):
 """
 Private slot to handle the Rename Current Module action.
 """
 self.__doRename(self.trUtf8('Rename Current Module'),
 renameModule=True)
 def __doRename(self, title, isLocal=False, renameModule=False):
 """
 Private method to perform the various renaming refactorings.
 @param title title of the refactoring (string)
 @param isLocal flag indicating to restrict refactoring to
 the local file (boolean)
 @param renameModule flag indicating a module rename refactoring
 (boolean)
 """
 aw = e5App().getObject("ViewManager").activeWindow()
 if not renameModule and not aw.hasSelectedText():
 # no selection available
 QMessageBox.warning(self.__ui, title,
 self.trUtf8("Highlight the declaration you want to rename"
 " and try again."))
 return
 if isLocal:
 if not self.confirmBufferIsSaved(aw):
 return
 else:
 if line != line1:
 # selection span more than one line
 QMessageBox.warning(self.__ui, title,
 self.trUtf8("The selection must not extend beyond"
 " one line."))
 return
-index = int(index  + (index1 - index) / 2)
+index = int(index + (index1 - index) / 2)
 # keep it inside the object
 offset = aw.positionFromLineIndex(line, index)
 resource = rope.base.libutils.path_to_resource(
 self.__project, filename)
 try:
 renamer = rope.refactor.rename.Rename(
 self.__project, resource, offset)
 except Exception as err:
 self.handleRopeError(err, title)
 return
 if isLocal:
 localResource = resource
 else:
 localResource = None
 if not aw.hasSelectedText():
 # no selection available
 QMessageBox.warning(self.__ui, title,
 self.trUtf8("Highlight an occurrence to be changed"
 " and try again."))
 return
 if not self.confirmBufferIsSaved(aw):
 return
 filename = aw.getFileName()
 try:
 renamer = rope.refactor.rename.ChangeOccurrences(
 self.__project, resource, offset)
 except Exception as err:
 self.handleRopeError(err, title)
 return
 self.dlg = ChangeOccurrencesDialog(self, title, renamer,
 parent=self.__ui)
 self.dlg.show()
 #####################################################
 ## Extract refactorings
 if not aw.hasSelectedText():
 # no selection available
 QMessageBox.warning(self.__ui, title,
 self.trUtf8("Highlight the region of code you want to extract"
 " and try again."))
 return
 if not self.confirmBufferIsSaved(aw):
 return
 filename = aw.getFileName()
 self.__project, resource, startOffset, endOffset)
 else:
 raise Exception("Invalid extraction kind <{0}>.".format(kind))
 except Exception as err:
 self.handleRopeError(err, title)
 return
-self.dlg = ExtractDialog(self, title, extractor, parent = self.__ui)
+self.dlg = ExtractDialog(self, title, extractor, parent=self.__ui)
 self.dlg.show()
 #####################################################
 ## Inline refactorings
 #####################################################
 if not aw.hasSelectedText():
 # no selection available
 QMessageBox.warning(self.__ui, title,
 self.trUtf8("Highlight the local variable, method or parameter"
 " you want to inline and try again."))
 return
 if not self.confirmAllBuffersSaved():
 return
 filename = aw.getFileName()
 try:
 inliner = rope.refactor.inline.create_inline(
 self.__project, resource, offset)
 except Exception as err:
 self.handleRopeError(err, title)
 return
-self.dlg = InlineDialog(self, title, inliner, parent = self.__ui)
+self.dlg = InlineDialog(self, title, inliner, parent=self.__ui)
 self.dlg.show()
 #####################################################
 ## Move refactorings
 #####################################################
 if not aw.hasSelectedText():
 # no selection available
 QMessageBox.warning(self.__ui, title,
 self.trUtf8("Highlight the method to move"
 " and try again."))
 return
 if not self.confirmAllBuffersSaved():
 return
 filename = aw.getFileName()
 try:
 mover = rope.refactor.move.create_move(
 self.__project, resource, offset)
 except Exception as err:
 self.handleRopeError(err, title)
 return
 self.dlg = MoveMethodDialog(self, title, mover, parent=self.__ui)
 self.dlg.show()
 def __moveModule(self):
 try:
 mover = rope.refactor.move.create_move(
 self.__project, resource, offset)
 except Exception as err:
 self.handleRopeError(err, title)
 return
 self.dlg = MoveModuleDialog(self, title, mover, parent=self.__ui)
 self.dlg.show()
 #####################################################
 title = self.trUtf8("Use Function")
 if not aw.hasSelectedText():
 # no selection available
 QMessageBox.warning(self.__ui, title,
 self.trUtf8("Highlight a global function and try again."))
 return
 if not self.confirmAllBuffersSaved():
 return
 filename = aw.getFileName()
 self.__project, resource, offset)
 except Exception as err:
 self.handleRopeError(err, title)
 return
-self.dlg = UseFunctionDialog(self, title, user, parent = self.__ui)
+self.dlg = UseFunctionDialog(self, title, user, parent=self.__ui)
 self.dlg.show()
 #####################################################
 ## Introduce refactorings
 #####################################################
 if not aw.hasSelectedText():
 # no selection available
 QMessageBox.warning(self.__ui, title,
 self.trUtf8("Highlight the class to introduce a factory"
 " method for and try again."))
 return
 if not self.confirmAllBuffersSaved():
 return
 filename = aw.getFileName()
 introducer = \
 rope.refactor.introduce_factory.IntroduceFactoryRefactoring(
 self.__project, resource, offset)
 except Exception as err:
 self.handleRopeError(err, title)
 return
 self.dlg = IntroduceFactoryDialog(self, title, introducer,
 parent=self.__ui)
 self.dlg.show()
 def __introduceParameter(self):
 """
 if not aw.hasSelectedText():
 # no selection available
 QMessageBox.warning(self.__ui, title,
 self.trUtf8("Highlight the code for the new parameter"
 " and try again."))
 return
 if not self.confirmAllBuffersSaved():
 return
 filename = aw.getFileName()
 try:
 introducer = rope.refactor.introduce_parameter.IntroduceParameter(
 self.__project, resource, offset)
 except Exception as err:
 self.handleRopeError(err, title)
 return
 self.dlg = IntroduceParameterDialog(self, title, introducer,
 parent=self.__ui)
 self.dlg.show()
 #####################################################
 ## Import refactorings
 def __importsOrganize(self):
 """
 Private slot to organize imports.
 """
 self.__doImports(self.trUtf8("Organize Imports"),
 ImportOrganizer.organize_imports)
 def __importsExpandStar(self):
 """
 Private slot to expand star imports.
 """
 self.__doImports(self.trUtf8("Expand Star Imports"),
 ImportOrganizer.expand_star_imports)
 def __importsRelativeToAbsolute(self):
 """
 Private slot to transform relative to absolute imports.
 """
 self.__doImports(self.trUtf8("Relative to Absolute"),
 ImportOrganizer.relatives_to_absolutes)
 def __importsFromToImport(self):
 """
 Private slot to transform from imports to plain imports.
 """
 self.__doImports(self.trUtf8("Froms to Imports"),
 ImportOrganizer.froms_to_imports)
 def __importsHandleLong(self):
 """
 Private slot to handle long imports.
 """
 self.__doImports(self.trUtf8("Handle Long Imports"),
 ImportOrganizer.handle_long_imports)
 def __doImports(self, title, method):
 """
 Private method to perform the various imports refactorings.
 if not aw.hasSelectedText():
 # no selection available
 QMessageBox.warning(self.__ui, title,
 self.trUtf8("Highlight the method or function to change"
 " and try again."))
 return
 if not self.confirmAllBuffersSaved():
 return
 filename = aw.getFileName()
 try:
 changer = rope.refactor.change_signature.ChangeSignature(
 self.__project, resource, offset)
 except Exception as err:
 self.handleRopeError(err, title)
 return
 self.dlg = ChangeSignatureDialog(self, title, changer,
 parent=self.__ui)
 self.dlg.show()
 def __inlineArgumentDefault(self):
 """
 if not aw.hasSelectedText():
 # no selection available
 QMessageBox.warning(self.__ui, title,
 self.trUtf8("Highlight the method or function to inline"
 " a parameter's default and try again."))
 return
 if not self.confirmAllBuffersSaved():
 return
 filename = aw.getFileName()
 try:
 changer = rope.refactor.change_signature.ChangeSignature(
 self.__project, resource, offset)
 except Exception as err:
 self.handleRopeError(err, title)
 return
 self.dlg = InlineArgumentDefaultDialog(self, title, changer,
 parent=self.__ui)
 self.dlg.show()
 def __transformModuleToPackage(self):
 """
 self.__project.do(changes)
 if self.__e5project.isDirty():
 self.__e5project.saveProject()
 except Exception as err:
 self.handleRopeError(err, title)
 return
 def __encapsulateAttribute(self):
 """
 Private slot to encapsulate an attribute.
 """
 if not aw.hasSelectedText():
 # no selection available
 QMessageBox.warning(self.__ui, title,
 self.trUtf8("Highlight the attribute to encapsulate"
 " and try again."))
 return
 if not self.confirmAllBuffersSaved():
 return
 filename = aw.getFileName()
 if not aw.hasSelectedText():
 # no selection available
 QMessageBox.warning(self.__ui, title,
 self.trUtf8("Highlight the local variable to make an attribute"
 " and try again."))
 return
 if not self.confirmAllBuffersSaved():
 return
 filename = aw.getFileName()
 if not aw.hasSelectedText():
 # no selection available
 QMessageBox.warning(self.__ui, title,
 self.trUtf8("Highlight the method or function to convert"
 " and try again."))
 return
 if not self.confirmAllBuffersSaved():
 return
 filename = aw.getFileName()
 try:
 converter = rope.refactor.method_object.MethodObject(
 self.__project, resource, offset)
 except Exception as err:
 self.handleRopeError(err, title)
 return
 self.dlg = MethodToMethodObjectDialog(self, title, converter,
 parent=self.__ui)
 self.dlg.show()
 self.dlg = HistoryDialog(self, redoList, False, self.__ui)
 self.dlg.show()
 def __showFileUndoHistory(self):
 """
 Private method to show list of changes related to the current file
 available for an undo operation.
 """
 aw = e5App().getObject("ViewManager").activeWindow()
 if aw is None:
 self.dlg = HistoryDialog(self, undoList, True, self.__ui)
 self.dlg.show()
 def __showFileRedoHistory(self):
 """
 Private method to show list of changes related to the current file
 available for a redo operation.
 """
 aw = e5App().getObject("ViewManager").activeWindow()
 if aw is None:
 if not aw.hasSelectedText():
 # no selection available
 QMessageBox.warning(self.__ui, title,
 self.trUtf8("Highlight the class, method, function or variable"
 " to search for and try again."))
 return
 if not self.confirmAllBuffersSaved():
 return
 filename = aw.getFileName()
 handle.show()
 QApplication.processEvents()
 try:
 occurrences = rope.contrib.findit.find_occurrences(
 self.__project, resource, offset,
-unsure = True, in_hierarchy = True, task_handle = handle)
+unsure=True, in_hierarchy=True, task_handle=handle)
 except Exception as err:
 self.handleRopeError(err, title, handle)
 return
 handle.reset()
 if occurrences:
 self.dlg = MatchesDialog(self.__ui, True)
 self.dlg.show()
 for occurrence in occurrences:
 self.dlg.addEntry(occurrence.resource,
 occurrence.lineno, occurrence.unsure)
 else:
 QMessageBox.warning(self.__ui, title,
 self.trUtf8("No occurrences found."))
 # no selection available
 QMessageBox.warning(self.__ui, title,
 self.trUtf8("Highlight the class, method, function or"
 " variable reference to search definition for and"
 " try again."))
 return
 if not self.confirmAllBuffersSaved():
 return
 filename = aw.getFileName()
 if not aw.hasSelectedText():
 # no selection available
 QMessageBox.warning(self.__ui, title,
 self.trUtf8("Highlight the method to search for"
 " and try again."))
 return
 if not self.confirmAllBuffersSaved():
 return
 filename = aw.getFileName()
 line, index, line1, index1 = aw.getSelection()
 offset = aw.positionFromLineIndex(line, index)
 resource = rope.base.libutils.path_to_resource(self.__project,
 filename)
 handle = ProgressHandle(title, True, self.__ui)
 handle.show()
 QApplication.processEvents()
 try:
 occurrences = rope.contrib.findit.find_implementations(
-self.__project, resource, offset, task_handle = handle)
+self.__project, resource, offset, task_handle=handle)
 except Exception as err:
 self.handleRopeError(err, title, handle)
 return
 handle.reset()
 if occurrences:
 self.dlg = MatchesDialog(self.__ui, True)
 self.dlg.show()
 for occurrence in occurrences:
 self.dlg.addEntry(occurrence.resource,
 occurrence.lineno, occurrence.unsure)
 else:
 QMessageBox.warning(self.__ui, title,
 self.trUtf8("No occurrences found."))
 self.__editor = MiniEditor(configfile)
 self.__editor.show()
 if self.__newStyle:
 self.__editor.editorSaved.connect(self.__configChanged)
 else:
 self.connect(self.__editor, SIGNAL("editorSaved"),
 self.__configChanged)
 else:
 QMessageBox.critical(self.__ui,
 self.trUtf8("Configure Rope"),
 self.trUtf8("""The Rope configuration file '{0}' does"""
 def __showRopeHelp(self):
 """
 Private slot to show help about the refactorings offered by Rope.
 """
 if self.__helpDialog is None:
 helpfile = os.path.join(os.path.dirname(__file__),
 "rope", "docs", "overview.txt")
 self.__helpDialog = \
 HelpDialog(self.trUtf8("Help about rope refactorings"),
 helpfile)
 self.__helpDialog.show()
 def __performSOA(self):
 """
 if res == QMessageBox.Yes:
 handle = ProgressHandle(title, True, self.__ui)
 handle.show()
 QApplication.processEvents()
 try:
 rope.base.libutils.analyze_modules(self.__project,
 task_handle=handle)
 handle.reset()
 QMessageBox.information(self.__ui,
 title,
 self.trUtf8("""Static object analysis (SOA) done. """
 def __configChanged(self):
 """
 Private slot called, when the rope config file has changed.
 """
 self.__project.close()
 self.__project = rope.base.project.Project(self.__projectpath,
-fscommands = self.__fsCommands)
+fscommands=self.__fsCommands)
 def __defaultConfig(self):
 """
 Private slot to return the contents of rope's default configuration.
 self.__projectopen = True
 self.__projectpath = self.__e5project.getProjectPath()
 self.__projectLanguage = self.__e5project.getProjectLanguage()
 if self.__projectLanguage in ["Python3"]:
 self.__project = rope.base.project.Project(self.__projectpath,
-fscommands = self.__fsCommands)
+fscommands=self.__fsCommands)
 for act in self.actions:
 act.setEnabled(True)
 def projectClosed(self):
 """
 def confirmBufferIsSaved(self, editor):
 """
 Public method to check, if an editor has unsaved changes.
 @param editor reference to the editor to be checked
 @return flag indicating, that the editor doesn't contain
 unsaved edits (boolean)
 """
 res = editor.checkDirty()
 self.__project.validate(self.__project.root)
 return res
 def confirmAllBuffersSaved(self):
 """
 Private method to check, if any editor has unsaved changes.
 @return flag indicating, that no editor contains unsaved edits
 (boolean)
 """
 res = e5App().getObject("ViewManager").checkAllDirty()
 self.__project.validate(self.__project.root)
 return res
 aw = vm.activeWindow()
 if aw is not None:
 filename = aw.getFileName()
 if filename is not None:
 vm.openSourceFile(filename, aw.getCursorPosition()[0] + 1)

Mercurial Repositories > Rope Refactoring / file comparison

comparison: RefactoringRope/Refactoring.py

RefactoringRope/Refactoring.py