diff -r 0e5421d679e7 -r ea526b78ee6c HexEdit/HexEditSearchReplaceWidget.py
--- a/HexEdit/HexEditSearchReplaceWidget.py Tue Mar 07 18:46:09 2017 +0100
+++ b/HexEdit/HexEditSearchReplaceWidget.py Tue Mar 07 18:53:18 2017 +0100
@@ -9,7 +9,7 @@
from __future__ import unicode_literals
try:
- str = unicode # __IGNORE_EXCEPTION__
+ str = unicode # __IGNORE_EXCEPTION__ __IGNORE_WARNING_M131__
except NameError:
pass
@@ -85,13 +85,13 @@
self.__ui.replaceAllButton.setIcon(
UI.PixmapCache.getIcon("editReplaceAll.png"))
- for format in formatOrder:
- formatStr, validator = self.__formatAndValidators[format]
- self.__ui.findFormatCombo.addItem(formatStr, format)
+ for dataFormat in formatOrder:
+ formatStr, validator = self.__formatAndValidators[dataFormat]
+ self.__ui.findFormatCombo.addItem(formatStr, dataFormat)
if replace:
- for format in formatOrder:
- formatStr, validator = self.__formatAndValidators[format]
- self.__ui.replaceFormatCombo.addItem(formatStr, format)
+ for dataFormat in formatOrder:
+ formatStr, validator = self.__formatAndValidators[dataFormat]
+ self.__ui.replaceFormatCombo.addItem(formatStr, dataFormat)
self.__ui.findtextCombo.setCompleter(None)
self.__ui.findtextCombo.lineEdit().returnPressed.connect(
@@ -128,16 +128,16 @@
@type int
"""
if idx >= 0:
- format = self.__ui.findFormatCombo.itemData(idx)
+ findFormat = self.__ui.findFormatCombo.itemData(idx)
- if format != self.__currentFindFormat:
+ if findFormat != self.__currentFindFormat:
txt = self.__ui.findtextCombo.currentText()
newTxt = self.__convertText(
- txt, self.__currentFindFormat, format)
- self.__currentFindFormat = format
+ txt, self.__currentFindFormat, findFormat)
+ self.__currentFindFormat = findFormat
self.__ui.findtextCombo.setValidator(
- self.__formatAndValidators[format][1])
+ self.__formatAndValidators[findFormat][1])
self.__ui.findtextCombo.setEditText(newTxt)
@@ -202,8 +202,8 @@
txt = textCombo.currentText()
idx = formatCombo.currentIndex()
- format = formatCombo.itemData(idx)
- ba = self.__text2bytearray(txt, format)
+ findFormat = formatCombo.itemData(idx)
+ ba = self.__text2bytearray(txt, findFormat)
# This moves any previous occurrence of this statement to the head
# of the list and updates the combobox
@@ -292,16 +292,16 @@
@type int
"""
if idx >= 0:
- format = self.__ui.replaceFormatCombo.itemData(idx)
+ replaceFormat = self.__ui.replaceFormatCombo.itemData(idx)
- if format != self.__currentReplaceFormat:
+ if replaceFormat != self.__currentReplaceFormat:
txt = self.__ui.replacetextCombo.currentText()
newTxt = self.__convertText(
- txt, self.__currentReplaceFormat, format)
- self.__currentReplaceFormat = format
+ txt, self.__currentReplaceFormat, replaceFormat)
+ self.__currentReplaceFormat = replaceFormat
self.__ui.replacetextCombo.setValidator(
- self.__formatAndValidators[format][1])
+ self.__formatAndValidators[replaceFormat][1])
self.__ui.replacetextCombo.setEditText(newTxt)
@@ -531,59 +531,59 @@
return value
- def __text2bytearray(self, txt, format):
+ def __text2bytearray(self, txt, dataFormat):
"""
Private method to convert a text to a byte array.
@param txt text to be converted
@type str
- @param format format of the text
+ @param dataFormat format of the text
@type str
@return converted text
@rtype bytearray
"""
- assert format in self.__formatAndValidators.keys()
+ assert dataFormat in self.__formatAndValidators.keys()
- if format == "hex": # hex format
+ if dataFormat == "hex": # hex format
ba = bytearray(QByteArray.fromHex(
bytes(txt, encoding="ascii")))
- elif format == "dec": # decimal format
+ elif dataFormat == "dec": # decimal format
ba = self.__int2bytearray(int(txt, 10))
- elif format == "oct": # octal format
+ elif dataFormat == "oct": # octal format
ba = self.__int2bytearray(int(txt, 8))
- elif format == "bin": # binary format
+ elif dataFormat == "bin": # binary format
ba = self.__int2bytearray(int(txt, 2))
- elif format == "iso-8859-1": # latin-1/iso-8859-1 text
+ elif dataFormat == "iso-8859-1": # latin-1/iso-8859-1 text
ba = bytearray(txt, encoding="iso-8859-1")
- elif format == "utf-8": # utf-8 text
+ elif dataFormat == "utf-8": # utf-8 text
ba = bytearray(txt, encoding="utf-8")
return ba
- def __bytearray2text(self, array, format):
+ def __bytearray2text(self, array, dataFormat):
"""
Private method to convert a byte array to a text.
@param array byte array to be converted
@type bytearray
- @param format format of the text
+ @param dataFormat format of the text
@type str
@return formatted text
@rtype str
"""
- assert format in self.__formatAndValidators.keys()
+ assert dataFormat in self.__formatAndValidators.keys()
- if format == "hex": # hex format
+ if dataFormat == "hex": # hex format
txt = "{0:x}".format(self.__bytearray2int(array))
- elif format == "dec": # decimal format
+ elif dataFormat == "dec": # decimal format
txt = "{0:d}".format(self.__bytearray2int(array))
- elif format == "oct": # octal format
+ elif dataFormat == "oct": # octal format
txt = "{0:o}".format(self.__bytearray2int(array))
- elif format == "bin": # binary format
+ elif dataFormat == "bin": # binary format
txt = "{0:b}".format(self.__bytearray2int(array))
- elif format == "iso-8859-1": # latin-1/iso-8859-1 text
+ elif dataFormat == "iso-8859-1": # latin-1/iso-8859-1 text
txt = str(array, encoding="iso-8859-1")
- elif format == "utf-8": # utf-8 text
+ elif dataFormat == "utf-8": # utf-8 text
txt = str(array, encoding="utf-8", errors="replace")
return txt
