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 f84176fc42d348d476413b984f7cabc395793606..60f992be050a0c5389a1fabfa11e98f23d9e7d9d 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 cbf6d7547d9f97ab78dea8f400d8d0ef7b4b3290..aaf2b30abd6df59a75dca5487527dccc7770b703 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -15,6 +15,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #2703: SimpleXMLRPCDispatcher.__init__: Provide default values for
+  new arguments introduced in 2.5.
+
 
 What's New in Python 3.1 alpha 2?
 =================================