Mercurial Repositories > eric / file diff

diff -r 77755a5ea30c -r 4f2dd0850803 UI/NumbersWidget.py
--- a/UI/NumbersWidget.py	Sat Mar 11 13:11:29 2017 +0100
+++ b/UI/NumbersWidget.py	Sat Mar 11 14:35:22 2017 +0100
@@ -210,11 +210,11 @@
         self.__model.setBitsAndValue(self.__bytes * 8, self.__input)
         self.__model.dataChanged.connect(self.__binModelDataChanged)
     
-    def __formatNumbers(self, format):
+    def __formatNumbers(self, numberFormat):
         """
         Private method to format the various number inputs.
         
-        @param format number format indicator (integer)
+        @param numberFormat number format indicator (integer)
         """
         self.__block(True)
         
@@ -224,7 +224,7 @@
         self.hexEdit.setStyleSheet("")
         
         # determine byte count
-        bytes = 8
+        byteCount = 8
         tmp = self.__input
         for i in range(8):
             c = (tmp & 0xff00000000000000) >> 7 * 8
@@ -233,35 +233,35 @@
             if c != 0xff and self.__input < 0:
                 break
             tmp <<= 8
-            bytes -= 1
-        if bytes == 0:
-            bytes = 1
-        self.__bytes = bytes
+            byteCount -= 1
+        if byteCount == 0:
+            byteCount = 1
+        self.__bytes = byteCount
         
         bytesIn = self.sizeBox.itemData(self.sizeBox.currentIndex()) // 8
-        if bytesIn and bytes > bytesIn:
+        if bytesIn and byteCount > bytesIn:
             self.sizeBox.setStyleSheet(self.__badNumberSheet)
         else:
             self.sizeBox.setStyleSheet("")
         
         # octal
-        if format != 8:
+        if numberFormat != 8:
             self.octEdit.setText("{0:0{1}o}".format(self.__input, bytesIn * 3))
         
         # decimal
-        if format != 10:
+        if numberFormat != 10:
             self.decEdit.setText("{0:d}".format(self.__input))
         
         # hexadecimal
-        if format != 16:
+        if numberFormat != 16:
             self.hexEdit.setText("{0:0{1}x}".format(self.__input, bytesIn * 2))
         
         # octal
-        if format != 8:
+        if numberFormat != 8:
             self.octEdit.setText("{0:0{1}o}".format(self.__input, bytesIn * 3))
         
         # binary
-        if format != 2:
+        if numberFormat != 2:
             num = "{0:0{1}b}".format(self.__input, bytesIn * 8)
             self.binEdit.setText(num)