Mercurial Repositories > Rope Refactoring / file diff

--- a/RefactoringRope/HistoryDialog.py	Wed Mar 08 19:35:56 2017 +0100
+++ b/RefactoringRope/HistoryDialog.py	Tue Mar 28 19:36:35 2017 +0200
@@ -78,22 +78,22 @@
             return
         
         self.previewEdit.clear()
-        id = current.data(HistoryDialog.ChangeIDRole)
-        change = self.__changes[id]
+        changeId = current.data(HistoryDialog.ChangeIDRole)
+        change = self.__changes[changeId]
         for line in change.get_description().splitlines(True):
             try:
-                format = self.formats[line[0]]
+                charFormat = self.formats[line[0]]
             except (IndexError, KeyError):
-                format = self.formats[' ']
-            self._appendText(line, format)
+                charFormat = self.formats[' ']
+            self._appendText(line, charFormat)
     
     def accept(self):
         """
         Public slot to undo the selected set of changes.
         """
-        id = self.changesList.currentItem()\
-                 .data(HistoryDialog.ChangeIDRole)
-        change = self.__changes[id]
+        changeId = self.changesList.currentItem()\
+            .data(HistoryDialog.ChangeIDRole)
+        change = self.__changes[changeId]
         
         if self.__isUndo:
             res = E5MessageBox.yesNo(