summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Lib/test/string_tests.py4
-rw-r--r--Lib/test/test_bytes.py3
-rw-r--r--Modules/_tkinter.c2
3 files changed, 1 insertions, 8 deletions
diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py
index e9285a62f6..909f947472 100644
--- 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 5c3a3ae4b5..659afacf44 100644
--- 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 094308b1c3..577ad626dc 100644
--- 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)