merge

klen · klen · commit 2ad79700cee3 · 2015-08-25T18:53:09.000+03:00
diff --git a/AUTHORS b/AUTHORS
@@ -16,6 +16,7 @@ Contributors:
 * Daniel Hahler (http://github.com/blueyed)
 * David Vogt (http://github.com/winged);
 * Denis Kasak (http://github.com/dkasak);
+* Dimitrios Semitsoglou-Tsiapos (https://github.com/dset0x)
 * Dirk Wallenstein (http://github.com/dirkwallenstein);
 * Florent Xicluna (http://github.com/florentx);
 * Fredrik Henrysson (http://github.com/fhenrysson);
diff --git a/pymode/rope.py b/pymode/rope.py
@@ -502,14 +502,7 @@ def get_input_str(refactor, ctx):
 
     @staticmethod
     def get_changes(refactor, input_str, in_hierarchy=False):
-        """ Get changes.
-
-        :return Changes:
-
-        """
-        progress = ProgressHandler('Calculate changes ...')
-        return refactor.get_changes(
-            input_str, task_handle=progress.handle, in_hierarchy=in_hierarchy)
+        return refactor.get_changes(input_str)
 
 
 class RenameRefactoring(Refactoring):
@@ -547,6 +540,15 @@ def get_input_str(self, refactor, ctx):
 
         return newname
 
+    @staticmethod
+    def get_changes(refactor, input_str, in_hierarchy=False):
+        """ Get changes.
+
+        :return Changes:
+
+        """
+        return refactor.get_changes(input_str, in_hierarchy=in_hierarchy)
+
 
 class ExtractMethodRefactoring(Refactoring):
 
@@ -571,16 +573,6 @@ def get_refactor(ctx):
         return extract.ExtractMethod(
             ctx.project, ctx.resource, offset1, offset2)
 
-    @staticmethod
-    def get_changes(refactor, input_str):
-        """ Get changes.
-
-        :return Changes:
-
-        """
-
-        return refactor.get_changes(input_str)
-
 
 class ExtractVariableRefactoring(Refactoring):
 
@@ -605,16 +597,6 @@ def get_refactor(ctx):
         return extract.ExtractVariable(
             ctx.project, ctx.resource, offset1, offset2)
 
-    @staticmethod
-    def get_changes(refactor, input_str):
-        """ Get changes.
-
-        :return Changes:
-
-        """
-
-        return refactor.get_changes(input_str)
-
 
 class InlineRefactoring(Refactoring):
 
@@ -631,14 +613,13 @@ def get_refactor(ctx):
         return inline.create_inline(ctx.project, ctx.resource, offset)
 
     @staticmethod
-    def get_changes(refactor, input_str):
+    def get_changes(refactor, input_str, in_hierarchy=False):
         """ Get changes.
 
         :return Changes:
 
         """
-        progress = ProgressHandler('Calculate changes ...')
-        return refactor.get_changes(task_handle=progress.handle)
+        return refactor.get_changes()
 
 
 class UseFunctionRefactoring(Refactoring):
@@ -656,15 +637,13 @@ def get_refactor(ctx):
         return usefunction.UseFunction(ctx.project, ctx.resource, offset)
 
     @staticmethod
-    def get_changes(refactor, input_str):
+    def get_changes(refactor, input_str, in_hierarchy=False):
         """ Get changes.
 
         :return Changes:
 
         """
-        progress = ProgressHandler('Calculate changes ...')
-        return refactor.get_changes(
-            resources=[refactor.resource], task_handle=progress.handle)
+        return refactor.get_changes()
 
 
 class ModuleToPackageRefactoring(Refactoring):
@@ -681,7 +660,7 @@ def get_refactor(ctx):
         return ModuleToPackage(ctx.project, ctx.resource)
 
     @staticmethod
-    def get_changes(refactor, input_str):
+    def get_changes(refactor, input_str, in_hierarchy=False):
         """ Get changes.
 
         :return Changes:
@@ -767,7 +746,7 @@ def get_changes(self, refactor, input_string, in_hierarchy=False):
         changers.append(change_signature.ArgumentReorderer(
             order, autodef='None'))
 
-        return refactor.get_changes(changers)
+        return refactor.get_changes(changers, in_hierarchy=in_hierarchy)
 
 
 class GenerateElementRefactoring(Refactoring):
