From: Barry Warsaw <barry@python.org>
Date: Tue, 6 Oct 1998 16:08:39 +0000 (+0000)
Subject: __togglehex(): Simplify
X-Git-Tag: v1.5.2a2~146
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c2d8f573eb72121325613df760df4590d7b1e375;p=python

__togglehex(): Simplify
---

diff --git a/Tools/pynche/TypeinViewer.py b/Tools/pynche/TypeinViewer.py
index d3dad51d71..6e50f0f9b8 100644
--- a/Tools/pynche/TypeinViewer.py
+++ b/Tools/pynche/TypeinViewer.py
@@ -58,18 +58,8 @@ class TypeinViewer:
         self.__hex.grid(row=4, column=0, columnspan=2, sticky=W)
 
     def __togglehex(self, event=None):
-        rstr = self.__x.get()
-        gstr = self.__y.get()
-        bstr = self.__z.get()
-        if self.__hexp.get():
-            # it was decimal and is now hex
-            apply(self.update_yourself, tuple(map(int, (rstr, gstr, bstr))))
-        else:
-            # it was hex and is now decimal
-            red = string.atoi(rstr, 16)
-            green = string.atoi(gstr, 16)
-            blue = string.atoi(bstr, 16)
-            self.update_yourself(red, green, blue)
+        red, green, blue = self.__sb.current_rgb()
+        self.update_yourself(red, green, blue)
 
     def __normalize(self, event=None):
         ew = event.widget