From: Matthias Klose <doko@ubuntu.com>
Date: Sun, 5 Apr 2009 21:34:15 +0000 (+0000)
Subject: Merged revisions 71268 via svnmerge from
X-Git-Tag: v2.6.2c1~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=65396b4dcdb09c6ace6b23ab2bd2def6020ad255;p=python

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 b304e45c11..6af2f2f7e0 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 0addc8b829..17ff1aa10f 100644
--- 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
 -----------