Removed some leftovers from the str8 days

diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py
index e9285a62f6ff76906cf430650cc7c2ee67f47947..909f94747291053d974ff86c5ae857e53ae49bda 100644 (file)
--- a/Lib/test/string_tests.py
+++ b/Lib/test/string_tests.py
@@ -586,10 +586,6 @@ class CommonTest(BaseTest):
         a = self.type2test('DNSSEC')
         b = self.type2test('')
         for c in a:
-##             # Special case for the str8, since indexing returns a integer
-##             # XXX Maybe it would be a good idea to seperate str8's tests...
-##             if self.type2test == str8:
-##                 c = chr(c)
             b += c
             hash(b)
         self.assertEqual(hash(a), hash(b))

diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
index 5c3a3ae4b5030abbf5ede250e340e648adc3775b..659afacf4447996fa0c9e9cd32872c5404415133 100644 (file)
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -801,9 +801,6 @@ class BytearrayPEP3137Test(unittest.TestCase,
                        test.buffer_tests.MixinBytesBufferCommonTests):
     def marshal(self, x):
         return bytearray(x)
-        # TODO this should become:
-        #return bytearray(x)
-        # once the bytes -> bytearray and str8 -> bytes rename happens
 
     def test_returns_new_copy(self):
         val = self.marshal(b'1234')

diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index 094308b1c363f6d4e8b7641a984584b376bf2679..577ad626dcea6b5cb2fa0f0e83ab884271312a36 100644 (file)
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -750,7 +750,7 @@ PyTclObject_TclString(PyObject *self)
 
 /* Like _str, but create Unicode if necessary. */
 PyDoc_STRVAR(PyTclObject_string__doc__,
-"the string representation of this object, either as str8 or str");
+"the string representation of this object, either as str or bytes");
 
 static PyObject *
 PyTclObject_string(PyTclObject *self, void *ignored)