From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Sun, 30 Oct 2011 19:22:25 +0000 (+0100)
Subject: Issue #13293: Better error message when trying to marshal bytes using xmlrpc.client.
X-Git-Tag: v3.2.3rc1~453^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93dfee1dfc0bf572d4d9579fd455a72c0c81f148;p=thirdparty%2FPython%2Fcpython.git

Issue #13293: Better error message when trying to marshal bytes using xmlrpc.client.
---

diff --git a/Lib/xmlrpc/client.py b/Lib/xmlrpc/client.py
index bd59f326fbe2..97d5aac53d5b 100644
--- a/Lib/xmlrpc/client.py
+++ b/Lib/xmlrpc/client.py
@@ -503,9 +503,7 @@ class Marshaller:
             f = self.dispatch[type(value)]
         except KeyError:
             # check if this object can be marshalled as a structure
-            try:
-                value.__dict__
-            except:
+            if not hasattr(value, '__dict__'):
                 raise TypeError("cannot marshal %s objects" % type(value))
             # check if this class is a sub-class of a basic type,
             # because we don't know how to marshal these types
@@ -553,12 +551,6 @@ class Marshaller:
         write("</double></value>\n")
     dispatch[float] = dump_double
 
-    def dump_string(self, value, write, escape=escape):
-        write("<value><string>")
-        write(escape(value))
-        write("</string></value>\n")
-    dispatch[bytes] = dump_string
-
     def dump_unicode(self, value, write, escape=escape):
         write("<value><string>")
         write(escape(value))
diff --git a/Misc/NEWS b/Misc/NEWS
index 80c435a3ada5..70572b41cd7c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -63,6 +63,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #13293: Better error message when trying to marshal bytes using
+  xmlrpc.client.
+
 - Issue #13291: NameError in xmlrpc package.
 
 - Issue #13258: Use callable() built-in in the standard library.