[Python-checkins] r71359 - in python/branches/release30-maint: Lib/xmlrpc/server.py Misc/NEWS

[matthias.klose]

Author: matthias.klose
Date: Tue Apr  7 16:48:10 2009
New Revision: 71359

Log:
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.
  ........
................


Modified:
   python/branches/release30-maint/Lib/xmlrpc/server.py
   python/branches/release30-maint/Misc/NEWS

Modified: python/branches/release30-maint/Lib/xmlrpc/server.py
==============================================================================
--- python/branches/release30-maint/Lib/xmlrpc/server.py	(original)
+++ python/branches/release30-maint/Lib/xmlrpc/server.py	Tue Apr  7 16:48:10 2009
@@ -159,7 +159,7 @@
     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

Modified: python/branches/release30-maint/Misc/NEWS
==============================================================================
--- python/branches/release30-maint/Misc/NEWS	(original)
+++ python/branches/release30-maint/Misc/NEWS	Tue Apr  7 16:48:10 2009
@@ -92,6 +92,9 @@
 - 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
 -----