[Python-checkins] r86052 - in python/branches/release31-maint: Lib/xmlrpc/server.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Sun Oct 31 19:15:00 2010
New Revision: 86052

Log:
Merged revisions 86051 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86051 | benjamin.peterson | 2010-10-31 13:13:04 -0500 (Sun, 31 Oct 2010) | 1 line
  
  more fun with string exceptions
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/xmlrpc/server.py

Modified: python/branches/release31-maint/Lib/xmlrpc/server.py
==============================================================================
--- python/branches/release31-maint/Lib/xmlrpc/server.py	(original)
+++ python/branches/release31-maint/Lib/xmlrpc/server.py	Sun Oct 31 19:15:00 2010
@@ -67,7 +67,7 @@
         elif method == 'add':
             return params[0] + params[1]
         else:
-            raise 'bad method'
+            raise ValueError('bad method')
 
 server = SimpleXMLRPCServer(("localhost", 8000))
 server.register_introspection_functions()