Merged revisions 71268 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71268 | matthias.klose | 2009-04-05 23:00:48 +0200 (So, 05 Apr 2009) | 3 lines

  - Issue #2703: SimpleXMLRPCDispatcher.__init__: Provide default values for
    new arguments introduced in 2.5.
........

diff --git a/Lib/SimpleXMLRPCServer.py b/Lib/SimpleXMLRPCServer.py
index b304e45c1128deba5032c9f97204ceea571bbfc0..6af2f2f7e0b5df75ca39756c60b4ebb4b0717807 100644 (file)
--- 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 0addc8b829cb13e91bf4f15ec94054f8bed50a4e..17ff1aa10f02dd1bbc4cf9b90784032ce9549d26 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -468,6 +468,9 @@ Library
 - Issue #1149804: macostools.mkdirs now even works when another process
   creates one of the needed subdirectories.
 
+- Issue #2703: SimpleXMLRPCDispatcher.__init__: Provide default values for
+  new arguments introduced in 2.5.
+
 Tools/Demos
 -----------