mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Cleanup xmlrpc: remove obsolete comments, unused imports. Add test for bytes marshalling.

Browse source
This commit is contained in:
Florent Xicluna 2011-10-30 20:19:32 +01:00
parent 3fa29f7cd7
commit c4fec937dc
3 changed files with 11 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/test/test_xmlrpc.py
View file

@ -140,6 +140,9 @@ class XMLRPCTestCase(unittest.TestCase):
('host.tld', ('host.tld',
[('Authorization', 'Basic dXNlcg==')], {})) [('Authorization', 'Basic dXNlcg==')], {}))
def test_dump_bytes(self):
self.assertRaises(TypeError, xmlrpclib.dumps, (b"my dog has fleas",))
def test_ssl_presence(self): def test_ssl_presence(self):
try: try:
import ssl import ssl
@ -177,7 +180,7 @@ class FaultTestCase(unittest.TestCase):
self.assertRaises(xmlrpclib.Fault, xmlrpclib.loads, s) self.assertRaises(xmlrpclib.Fault, xmlrpclib.loads, s)
def test_dotted_attribute(self): def test_dotted_attribute(self):
# this will raise AttirebuteError because code don't want us to use # this will raise AttributeError because code don't want us to use
# private methods # private methods
self.assertRaises(AttributeError, self.assertRaises(AttributeError,
xmlrpc.server.resolve_dotted_attribute, str, '__add') xmlrpc.server.resolve_dotted_attribute, str, '__add')

24
Lib/xmlrpc/client.py
View file

@ -85,11 +85,6 @@
# OF THIS SOFTWARE. # OF THIS SOFTWARE.
# -------------------------------------------------------------------- # --------------------------------------------------------------------
#
# things to look into some day:
# TODO: sort out True/False/boolean issues for Python 2.3
""" """
An XML-RPC client interface for Python. An XML-RPC client interface for Python.
@ -120,8 +115,7 @@ Exported classes:
Exported constants: Exported constants:
True (none)
False
Exported functions: Exported functions:
@ -133,7 +127,8 @@ Exported functions:
name (None if not present). name (None if not present).
""" """
import re, time, operator import base64
import time
import http.client import http.client
from xml.parsers import expat from xml.parsers import expat
import socket import socket
@ -230,7 +225,7 @@ class ResponseError(Error):
## ##
# Indicates an XML-RPC fault response package. This exception is # Indicates an XML-RPC fault response package. This exception is
# raised by the unmarshalling layer, if the XML-RPC response contains # raised by the unmarshalling layer, if the XML-RPC response contains
# a fault string. This exception can also used as a class, to # a fault string. This exception can also be used as a class, to
# generate a fault XML-RPC message. # generate a fault XML-RPC message.
# #
# @param faultCode The XML-RPC fault code. # @param faultCode The XML-RPC fault code.
@ -243,10 +238,7 @@ class Fault(Error):
self.faultCode = faultCode self.faultCode = faultCode
self.faultString = faultString self.faultString = faultString
def __repr__(self): def __repr__(self):
return ( return "<Fault %s: %r>" % (self.faultCode, self.faultString)
"<Fault %s: %s>" %
(self.faultCode, repr(self.faultString))
)
# -------------------------------------------------------------------- # --------------------------------------------------------------------
# Special values # Special values
@ -352,7 +344,7 @@ class DateTime:
return self.value return self.value
def __repr__(self): def __repr__(self):
return "<DateTime %s at %x>" % (repr(self.value), id(self)) return "<DateTime %r at %x>" % (self.value, id(self))
def decode(self, data): def decode(self, data):
self.value = str(data).strip() self.value = str(data).strip()
@ -378,9 +370,6 @@ def _datetime_type(data):
# #
# @param data An 8-bit string containing arbitrary data. # @param data An 8-bit string containing arbitrary data.
import base64
import io
class Binary: class Binary:
"""Wrapper for binary data.""" """Wrapper for binary data."""
@ -1198,7 +1187,6 @@ class Transport:
auth, host = urllib.parse.splituser(host) auth, host = urllib.parse.splituser(host)
if auth: if auth:
import base64
auth = urllib.parse.unquote_to_bytes(auth) auth = urllib.parse.unquote_to_bytes(auth)
auth = base64.encodebytes(auth).decode("utf-8") auth = base64.encodebytes(auth).decode("utf-8")
auth = "".join(auth.split()) # get rid of whitespace auth = "".join(auth.split()) # get rid of whitespace

3
Lib/xmlrpc/server.py
View file

@ -329,7 +329,6 @@ class SimpleXMLRPCDispatcher:
if method is None: if method is None:
return "" return ""
else: else:
import pydoc
return pydoc.getdoc(method) return pydoc.getdoc(method)
def system_multicall(self, call_list): def system_multicall(self, call_list):
@ -560,7 +559,7 @@ class SimpleXMLRPCServer(socketserver.TCPServer,
Simple XML-RPC server that allows functions and a single instance Simple XML-RPC server that allows functions and a single instance
to be installed to handle requests. The default implementation to be installed to handle requests. The default implementation
attempts to dispatch XML-RPC calls to the functions or instance attempts to dispatch XML-RPC calls to the functions or instance
installed in the server. Override the _dispatch method inhereted installed in the server. Override the _dispatch method inherited
from SimpleXMLRPCDispatcher to change this behavior. from SimpleXMLRPCDispatcher to change this behavior.
""" """