From: Serhiy Storchaka <storchaka@gmail.com>
Date: Mon, 16 Sep 2013 08:01:31 +0000 (+0300)
Subject: Issue #19029: Change non-existing since 3.0 StringType to str.
X-Git-Tag: v3.4.0a3~51^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=975fce37883899a55bbcdaa6300c5c6ffe9d3db2;p=thirdparty%2FPython%2Fcpython.git

Issue #19029: Change non-existing since 3.0 StringType to str.
---

diff --git a/Lib/tkinter/tix.py b/Lib/tkinter/tix.py
index 99f9fff8401b..5eecd04132ca 100644
--- a/Lib/tkinter/tix.py
+++ b/Lib/tkinter/tix.py
@@ -126,7 +126,7 @@ class tixCommand:
             for x in self.tk.split(self.tk.call('tix', 'configure')):
                 cnf[x[0][1:]] = (x[0][1:],) + x[1:]
             return cnf
-        if isinstance(cnf, StringType):
+        if isinstance(cnf, str):
             x = self.tk.split(self.tk.call('tix', 'configure', '-'+cnf))
             return (x[0][1:],) + x[1:]
         return self.tk.call(('tix', 'configure') + self._options(cnf))
@@ -388,9 +388,9 @@ class TixWidget(tkinter.Widget):
         """Set configuration options for all subwidgets (and self)."""
         if option == '':
             return
-        elif not isinstance(option, StringType):
+        elif not isinstance(option, str):
             option = repr(option)
-        if not isinstance(value, StringType):
+        if not isinstance(value, str):
             value = repr(value)
         names = self._subwidget_names()
         for name in names: