Mercurial Repositories > eric / file diff

--- a/UI/FindFileDialog.py	Sat Mar 11 13:11:29 2017 +0100
+++ b/UI/FindFileDialog.py	Sat Mar 11 14:35:22 2017 +0100
@@ -447,7 +447,7 @@
                 fn = file
             # read the file and split it into textlines
             try:
-                text, encoding, hash = Utilities.readEncodedFileWithHash(fn)
+                text, encoding, hashStr = Utilities.readEncodedFileWithHash(fn)
                 lines = text.splitlines(True)
             except (UnicodeError, IOError):
                 progress += 1
@@ -480,7 +480,7 @@
                         line = "- {0}\n+ {1}".format(
                             line, self.__stripEol(rline))
                     self.__createItem(file, count, line, start, end,
-                                      rline, hash)
+                                      rline, hashStr)
                     
                     if self.feelLikeCheckBox.isChecked():
                         fn = os.path.join(self.project.ppath, file)
@@ -608,7 +608,7 @@
                 
                 # read the file and split it into textlines
                 try:
-                    text, encoding, hash = \
+                    text, encoding, hashStr = \
                         Utilities.readEncodedFileWithHash(fn)
                     lines = text.splitlines(True)
                 except (UnicodeError, IOError) as err:
@@ -626,7 +626,7 @@
                 
                 # Check the original and the current hash. Skip the file,
                 # if hashes are different.
-                if origHash != hash:
+                if origHash != hashStr:
                     E5MessageBox.critical(
                         self,
                         self.tr("Replace in Files"),
@@ -634,7 +634,7 @@
                             """<p>The current and the original hash of the"""
                             """ file <b>{0}</b> are different. Skipping it."""
                             """</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p>""")
-                        .format(fn, origHash, hash)
+                        .format(fn, origHash, hashStr)
                     )
                     progress += 1
                     self.findProgress.setValue(progress)