[Python-3000-checkins] r59111 - in python/branches/py3k: Lib/test/string_tests.py Lib/test/test_bytes.py Modules/_tkinter.c

[christian.heimes]

Author: christian.heimes
Date: Thu Nov 22 06:56:35 2007
New Revision: 59111

Modified:
   python/branches/py3k/Lib/test/string_tests.py
   python/branches/py3k/Lib/test/test_bytes.py
   python/branches/py3k/Modules/_tkinter.c
Log:
Removed some leftovers from the str8 days

Modified: python/branches/py3k/Lib/test/string_tests.py
==============================================================================
--- python/branches/py3k/Lib/test/string_tests.py	(original)
+++ python/branches/py3k/Lib/test/string_tests.py	Thu Nov 22 06:56:35 2007
@@ -586,10 +586,6 @@
         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))

Modified: python/branches/py3k/Lib/test/test_bytes.py
==============================================================================
--- python/branches/py3k/Lib/test/test_bytes.py	(original)
+++ python/branches/py3k/Lib/test/test_bytes.py	Thu Nov 22 06:56:35 2007
@@ -801,9 +801,6 @@
                        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')

Modified: python/branches/py3k/Modules/_tkinter.c
==============================================================================
--- python/branches/py3k/Modules/_tkinter.c	(original)
+++ python/branches/py3k/Modules/_tkinter.c	Thu Nov 22 06:56:35 2007
@@ -750,7 +750,7 @@
 
 /* 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)