mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-17 12:18:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

[Patch #628208] Add optional support for the 'nil' extension

Browse source
This commit is contained in:
Andrew M. Kuchling 2003-04-25 00:26:51 +00:00
parent abea7ea9f9
commit a4c2b7485b
1 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Lib/xmlrpclib.py
View file

@ -566,11 +566,12 @@ class Marshaller:
# by the way, if you don't understand what's going on in here, # by the way, if you don't understand what's going on in here,
# that's perfectly ok. # that's perfectly ok.
def __init__(self, encoding=None): def __init__(self, encoding=None, allow_none=0):
self.memo = {} self.memo = {}
self.data = None self.data = None
self.encoding = encoding self.encoding = encoding
self.allow_none = allow_none
dispatch = {} dispatch = {}
def dumps(self, values): def dumps(self, values):
@ -606,6 +607,12 @@ class Marshaller:
else: else:
f(self, value, write) f(self, value, write)
def dump_nil (self, value, write):
if not self.allow_none:
raise TypeError, "cannot marshal None unless allow_none is enabled"
write("<value><nil/></value>")
dispatch[NoneType] = dump_nil
def dump_int(self, value, write): def dump_int(self, value, write):
# in case ints are > 32 bits # in case ints are > 32 bits
if value > MAXINT or value < MININT: if value > MAXINT or value < MININT:
@ -773,6 +780,11 @@ class Unmarshaller:
dispatch = {} dispatch = {}
def end_nil (self, data):
self.append(None)
self._value = 0
dispatch["nil"] = end_nil
def end_boolean(self, data): def end_boolean(self, data):
if data == "0": if data == "0":
self.append(False) self.append(False)
@ -899,7 +911,8 @@ def getparser():
# @keyparam encoding The packet encoding. # @keyparam encoding The packet encoding.
# @return A string containing marshalled data. # @return A string containing marshalled data.
def dumps(params, methodname=None, methodresponse=None, encoding=None): def dumps(params, methodname=None, methodresponse=None, encoding=None,
allow_none=0):
"""data [,options] -> marshalled data """data [,options] -> marshalled data
Convert an argument tuple or a Fault instance to an XML-RPC Convert an argument tuple or a Fault instance to an XML-RPC
@ -935,7 +948,7 @@ def dumps(params, methodname=None, methodresponse=None, encoding=None):
if FastMarshaller: if FastMarshaller:
m = FastMarshaller(encoding) m = FastMarshaller(encoding)
else: else:
m = Marshaller(encoding) m = Marshaller(encoding, allow_none)
data = m.dumps(params) data = m.dumps(params)
@ -1258,7 +1271,8 @@ class ServerProxy:
the given encoding. the given encoding.
""" """
def __init__(self, uri, transport=None, encoding=None, verbose=0): def __init__(self, uri, transport=None, encoding=None, verbose=0,
allow_none=0):
# establish a "logical" server connection # establish a "logical" server connection
# get the url # get the url
@ -1279,11 +1293,13 @@ class ServerProxy:
self.__encoding = encoding self.__encoding = encoding
self.__verbose = verbose self.__verbose = verbose
self.__allow_none = allow_none
def __request(self, methodname, params): def __request(self, methodname, params):
# call a method on the remote server # call a method on the remote server
request = dumps(params, methodname, encoding=self.__encoding) request = dumps(params, methodname, encoding=self.__encoding,
allow_none=self.__allow_none)
response = self.__transport.request( response = self.__transport.request(
self.__host, self.__host,
@ -1324,7 +1340,7 @@ if __name__ == "__main__":
# simple test program (from the XML-RPC specification) # simple test program (from the XML-RPC specification)
# server = ServerProxy("http://localhost:8000") # local server # server = ServerProxy("http://localhost:8000") # local server
server = ServerProxy("http://betty.userland.com") server = ServerProxy("http://betty.userland.com")
print server print server