Merged revisions 71355 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r71355 | matthias.klose | 2009-04-07 15:13:10 +0200 (Di, 07 Apr 2009) | 10 lines

  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/xmlrpc/server.py b/Lib/xmlrpc/server.py
index 4ddc0049d6702f7059dc1d1c6e1307ff8fcb48ca..665da30321b8e5c1ced43d63131ecf26d4da1e3e 100644 (file)
--- a/Lib/xmlrpc/server.py
+++ b/Lib/xmlrpc/server.py
@@ -159,7 +159,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 313bf211e3be7235c29783929b8bed25288c45a0..1d4ddf0f5c34d20b10a31295d34c2ee8f2ec87db 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -92,6 +92,9 @@ Library
 - Issue #4524: distutils build_script command failed with --with-suffix=3.
   Initial patch by Amaury Forgeot d'Arc.
 
+- Issue #2703: SimpleXMLRPCDispatcher.__init__: Provide default values for
+  new arguments introduced in 2.5.
+
 Build
 -----