[Python-checkins] cpython (merge 3.3 -> default): Issue #19029: Change non-existing since 3.0 StringType to str.

[serhiy.storchaka]

http://hg.python.org/cpython/rev/95b3efe3d7b7
changeset:   85727:95b3efe3d7b7
parent:      85725:29b8ec9195ff
parent:      85726:9eab3e745061
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Mon Sep 16 11:03:59 2013 +0300
summary:
  Issue #19029: Change non-existing since 3.0 StringType to str.

files:
  Lib/tkinter/tix.py |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Lib/tkinter/tix.py b/Lib/tkinter/tix.py
--- a/Lib/tkinter/tix.py
+++ b/Lib/tkinter/tix.py
@@ -126,7 +126,7 @@
             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 @@
         """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:

-- 
Repository URL: http://hg.python.org/cpython