mirror of
https://github.com/python/cpython.git
synced 2025-10-19 21:28:02 +00:00
Issue #13293: Better error message when trying to marshal bytes using xmlrpc.client.
This commit is contained in:
parent
c4fec937dc
commit
93dfee1dfc
2 changed files with 4 additions and 9 deletions
|
@ -503,9 +503,7 @@ class Marshaller:
|
||||||
f = self.dispatch[type(value)]
|
f = self.dispatch[type(value)]
|
||||||
except KeyError:
|
except KeyError:
|
||||||
# check if this object can be marshalled as a structure
|
# check if this object can be marshalled as a structure
|
||||||
try:
|
if not hasattr(value, '__dict__'):
|
||||||
value.__dict__
|
|
||||||
except:
|
|
||||||
raise TypeError("cannot marshal %s objects" % type(value))
|
raise TypeError("cannot marshal %s objects" % type(value))
|
||||||
# check if this class is a sub-class of a basic type,
|
# check if this class is a sub-class of a basic type,
|
||||||
# because we don't know how to marshal these types
|
# because we don't know how to marshal these types
|
||||||
|
@ -553,12 +551,6 @@ class Marshaller:
|
||||||
write("</double></value>\n")
|
write("</double></value>\n")
|
||||||
dispatch[float] = dump_double
|
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):
|
def dump_unicode(self, value, write, escape=escape):
|
||||||
write("<value><string>")
|
write("<value><string>")
|
||||||
write(escape(value))
|
write(escape(value))
|
||||||
|
|
|
@ -63,6 +63,9 @@ Core and Builtins
|
||||||
Library
|
Library
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
- Issue #13293: Better error message when trying to marshal bytes using
|
||||||
|
xmlrpc.client.
|
||||||
|
|
||||||
- Issue #13291: NameError in xmlrpc package.
|
- Issue #13291: NameError in xmlrpc package.
|
||||||
|
|
||||||
- Issue #13258: Use callable() built-in in the standard library.
|
- Issue #13258: Use callable() built-in in the standard library.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue