From 98297ee7815939b124156e438b22bd652d67b5db Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Tue, 6 Nov 2007 21:34:58 +0000
Subject: Merging the py3k-pep3137 branch back into the py3k branch. No
 detailed change log; just check out the change log for the py3k-pep3137
 branch.  The most obvious changes:

  - str8 renamed to bytes (PyString at the C level);
  - bytes renamed to buffer (PyBytes at the C level);
  - PyString and PyUnicode are no longer compatible.

I.e. we now have an immutable bytes type and a mutable bytes type.

The behavior of PyString was modified quite a bit, to make it more
bytes-like.  Some changes are still on the to-do list.
---
 Lib/xmlrpclib.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Lib/xmlrpclib.py')

diff --git a/Lib/xmlrpclib.py b/Lib/xmlrpclib.py
index efb0a7b48f..da96420311 100644
--- a/Lib/xmlrpclib.py
+++ b/Lib/xmlrpclib.py
@@ -622,7 +622,7 @@ class Marshaller:
         write("<value><string>")
         write(escape(value))
         write("</string></value>\n")
-    dispatch[str8] = dump_string
+    dispatch[bytes] = dump_string
 
     def dump_unicode(self, value, write, escape=escape):
         write("<value><string>")
-- 
cgit v1.2.1