Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/sugar/p2p
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2007-01-24 19:24:55 (GMT)
committer Dan Williams <dcbw@redhat.com>2007-01-24 19:24:55 (GMT)
commit9faf8bedd74f7773d01109f688b6b7ffa8a324ab (patch)
tree12f80425c3d610f8e775f7cce84640b4080f6854 /sugar/p2p
parent400fe4733be95bc047645ab00a620a314d5acc4f (diff)
Fix GlibXMLRPCServer for Python 2.5
Diffstat (limited to 'sugar/p2p')
-rw-r--r--sugar/p2p/network.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/sugar/p2p/network.py b/sugar/p2p/network.py
index e5b4e4b..90a1e6e 100644
--- a/sugar/p2p/network.py
+++ b/sugar/p2p/network.py
@@ -96,9 +96,13 @@ class GlibXMLRPCServer(GlibTCPServer, SimpleXMLRPCServer.SimpleXMLRPCDispatcher)
blocking on accept().
"""
- def __init__(self, addr, requestHandler=GlibXMLRPCRequestHandler, logRequests=0):
+ def __init__(self, addr, requestHandler=GlibXMLRPCRequestHandler,
+ logRequests=0, allow_none=False):
self.logRequests = logRequests
- SimpleXMLRPCServer.SimpleXMLRPCDispatcher.__init__(self)
+ if sys.version_info[:3] >= (2, 5, 0):
+ SimpleXMLRPCServer.SimpleXMLRPCDispatcher.__init__(self, allow_none, encoding="utf-8")
+ else:
+ SimpleXMLRPCServer.SimpleXMLRPCDispatcher.__init__(self)
GlibTCPServer.__init__(self, addr, requestHandler)
def _marshaled_dispatch(self, data, dispatch_method = None):