Index: Lib/pickletools.py
===================================================================
--- Lib/pickletools.py	(revision 56278)
+++ Lib/pickletools.py	(working copy)
@@ -281,7 +281,7 @@
     r"""
     >>> import io
     >>> read_stringnl(io.BytesIO(b"'abcd'\nefg\n"))
-    'abcd'
+    s'abcd'
 
     >>> read_stringnl(io.BytesIO(b"\n"))
     Traceback (most recent call last):
@@ -289,10 +289,10 @@
     ValueError: no string quotes around b''
 
     >>> read_stringnl(io.BytesIO(b"\n"), stripquotes=False)
-    ''
+    s''
 
     >>> read_stringnl(io.BytesIO(b"''\n"))
-    ''
+    s''
 
     >>> read_stringnl(io.BytesIO(b'"abcd"'))
     Traceback (most recent call last):
@@ -301,7 +301,7 @@
 
     Embedded escapes are undone in the result.
     >>> read_stringnl(io.BytesIO(br"'a\n\\b\x00c\td'" + b"\n'e'"))
-    'a\n\\b\x00c\td'
+    s'a\n\\b\x00c\td'
     """
 
     data = readline(f)
Index: Lib/test/test_pep263.py
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: Lib/test/test_poll.py
===================================================================
--- Lib/test/test_poll.py	(revision 56278)
+++ Lib/test/test_poll.py	(working copy)
@@ -25,7 +25,7 @@
         p = select.poll()
 
         NUM_PIPES = 12
-        MSG = " This is a test."
+        MSG = b" This is a test."
         MSG_LEN = len(MSG)
         readers = []
         writers = []
Index: Lib/test/test_bigmem.py
===================================================================
--- Lib/test/test_bigmem.py	(revision 56278)
+++ Lib/test/test_bigmem.py	(working copy)
@@ -850,7 +850,7 @@
         self.assertEquals(l.count("1"), 0)
 
     def basic_test_extend(self, size):
-        l = [file] * size
+        l = [object()] * size
         l.extend(l)
         self.assertEquals(len(l), size * 2)
         self.failUnless(l[0] is l[-1])