[Python-checkins] r71278 - in python/branches/release26-maint: Lib/SimpleXMLRPCServer.py Misc/NEWS

[matthias.klose]

Author: matthias.klose
Date: Sun Apr  5 23:34:15 2009
New Revision: 71278

Log:
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/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/SimpleXMLRPCServer.py
   python/branches/release26-maint/Misc/NEWS

Modified: python/branches/release26-maint/Lib/SimpleXMLRPCServer.py
==============================================================================
--- python/branches/release26-maint/Lib/SimpleXMLRPCServer.py	(original)
+++ python/branches/release26-maint/Lib/SimpleXMLRPCServer.py	Sun Apr  5 23:34:15 2009
@@ -164,7 +164,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/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Sun Apr  5 23:34:15 2009
@@ -468,6 +468,9 @@
 - 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
 -----------