[Python-checkins] cpython (merge 3.2 -> default): Merge with 3.2.

[georg.brandl]

http://hg.python.org/cpython/rev/3ebd934aeb7a
changeset:   77739:3ebd934aeb7a
parent:      77737:9c9cd6ed309f
parent:      77738:0228129533c9
user:        Georg Brandl <georg at python.org>
date:        Sun Jun 24 20:07:40 2012 +0200
summary:
  Merge with 3.2.

files:
  Lib/test/test_xmlrpc_net.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_xmlrpc_net.py b/Lib/test/test_xmlrpc_net.py
--- a/Lib/test/test_xmlrpc_net.py
+++ b/Lib/test/test_xmlrpc_net.py
@@ -39,7 +39,7 @@
     def test_python_builders(self):
         # Get the list of builders from the XMLRPC buildbot interface at
         # python.org.
-        server = xmlrpclib.ServerProxy("http://www.python.org/dev/buildbot/all/xmlrpc/")
+        server = xmlrpclib.ServerProxy("http://buildbot.python.org/all/xmlrpc/")
         try:
             builders = server.getAllBuilders()
         except socket.error as e:

-- 
Repository URL: http://hg.python.org/cpython