[Python-checkins] cpython (merge 3.3 -> default): Merge from 3.3

[andrew.kuchling]

http://hg.python.org/cpython/rev/f32dad3a243e
changeset:   84234:f32dad3a243e
parent:      84232:abebc6c1962b
parent:      84233:2a3bc6eb2e13
user:        Andrew Kuchling <amk at amk.ca>
date:        Thu Jun 20 21:40:14 2013 -0400
summary:
  Merge from 3.3

files:
  Doc/library/xmlrpc.client.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/library/xmlrpc.client.rst b/Doc/library/xmlrpc.client.rst
--- a/Doc/library/xmlrpc.client.rst
+++ b/Doc/library/xmlrpc.client.rst
@@ -435,7 +435,7 @@
    is a :term:`generator`; iterating over this generator yields the individual
    results.
 
-A usage example of this class follows.  The server code ::
+A usage example of this class follows.  The server code::
 
    from xmlrpc.server import SimpleXMLRPCServer
 
@@ -449,7 +449,7 @@
        return x*y
 
    def divide(x, y):
-       return x/y
+       return x // y
 
    # A simple server with simple arithmetic functions
    server = SimpleXMLRPCServer(("localhost", 8000))

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