From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 31 Oct 2010 18:15:00 +0000 (+0000)
Subject: Merged revisions 86051 via svnmerge from
X-Git-Tag: v3.1.3rc1~61
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af577cbb718c31994df5185ece03e7bdeba2959a;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/xmlrpc/server.py b/Lib/xmlrpc/server.py
index 04820bfc5676..1cd45a959645 100644
--- a/Lib/xmlrpc/server.py
+++ b/Lib/xmlrpc/server.py
@@ -67,7 +67,7 @@ class Math:
         elif method == 'add':
             return params[0] + params[1]
         else:
-            raise 'bad method'
+            raise ValueError('bad method')
 
 server = SimpleXMLRPCServer(("localhost", 8000))
 server.register_introspection_functions()