summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Lib/SimpleXMLRPCServer.py2
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/SimpleXMLRPCServer.py b/Lib/SimpleXMLRPCServer.py
index e9bda9a1c9..967ac7e2bb 100644
--- a/Lib/SimpleXMLRPCServer.py
+++ b/Lib/SimpleXMLRPCServer.py
@@ -164,7 +164,7 @@ class SimpleXMLRPCDispatcher:
reason to instantiate this class directly.
"""
- def __init__(self, allow_none, encoding):
+ def __init__(self, allow_none=False, encoding=None):
self.funcs = {}
self.instance = None
self.allow_none = allow_none
diff --git a/Misc/NEWS b/Misc/NEWS
index 0cff98c92a..b8d3883a86 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -689,6 +689,9 @@ Library
- Issue #999042: The Python compiler now handles explict global statements
correctly (should be assigned using STORE_GLOBAL opcode).
+- Issue #2703: SimpleXMLRPCDispatcher.__init__: Provide default values for
+ new arguments introduced in 2.5.
+
Tools/Demos
-----------