[Python-checkins] cpython (merge 3.3 -> default): #18267: merge with 3.3.

[ezio.melotti]

http://hg.python.org/cpython/rev/9875410ed390
changeset:   85067:9875410ed390
parent:      85065:f7ed301e7199
parent:      85066:38d341ef28b3
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Aug 08 15:46:13 2013 +0300
summary:
  #18267: merge with 3.3.

files:
  Doc/library/xmlrpc.client.rst |  18 +++++++++---------
  1 files changed, 9 insertions(+), 9 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
@@ -439,14 +439,14 @@
 
    from xmlrpc.server import SimpleXMLRPCServer
 
-   def add(x,y):
-       return x+y
+   def add(x, y):
+       return x + y
 
    def subtract(x, y):
-       return x-y
+       return x - y
 
    def multiply(x, y):
-       return x*y
+       return x * y
 
    def divide(x, y):
        return x // y
@@ -467,13 +467,13 @@
 
    proxy = xmlrpc.client.ServerProxy("http://localhost:8000/")
    multicall = xmlrpc.client.MultiCall(proxy)
-   multicall.add(7,3)
-   multicall.subtract(7,3)
-   multicall.multiply(7,3)
-   multicall.divide(7,3)
+   multicall.add(7, 3)
+   multicall.subtract(7, 3)
+   multicall.multiply(7, 3)
+   multicall.divide(7, 3)
    result = multicall()
 
-   print("7+3=%d, 7-3=%d, 7*3=%d, 7/3=%d" % tuple(result))
+   print("7+3=%d, 7-3=%d, 7*3=%d, 7//3=%d" % tuple(result))
 
 
 Convenience Functions

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