Fix User-Agent for the xmlrpc.client, and catch KeyboardInterrupt for the standalone...

diff --git a/Lib/xmlrpc/client.py b/Lib/xmlrpc/client.py
index 496b2b523c9999f0d2ef85da15b0b3f0f33df862..57e987bafd98bea845da6a4596e56eda0a9a3275 100644 (file)
--- a/Lib/xmlrpc/client.py
+++ b/Lib/xmlrpc/client.py
@@ -128,6 +128,7 @@ Exported functions:
 """
 
 import base64
+import sys
 import time
 import http.client
 from xml.parsers import expat
@@ -152,7 +153,8 @@ def escape(s):
     s = s.replace("<", "&lt;")
     return s.replace(">", "&gt;",)
 
-__version__ = "1.0.1"
+# used in User-Agent header sent
+__version__ = sys.version[:3]
 
 # xmlrpc integer limits
 MAXINT =  2**31-1
@@ -408,7 +410,6 @@ class Binary:
         out.write("<value><base64>\n")
         encoded = base64.encodebytes(self.data)
         out.write(encoded.decode('ascii'))
-        out.write('\n')
         out.write("</base64></value>\n")
 
 def _binary(data):
@@ -1079,7 +1080,7 @@ class Transport:
     """Handles an HTTP transaction to an XML-RPC server."""
 
     # client identifier (may be overridden)
-    user_agent = "xmlrpclib.py/%s (by www.pythonware.com)" % __version__
+    user_agent = "Python-xmlrpc/%s" % __version__
 
     #if true, we'll request gzip encoding
     accept_gzip_encoding = True

diff --git a/Lib/xmlrpc/server.py b/Lib/xmlrpc/server.py
index 72f3bfc1048b3005670fded42fc9dfaafcc2dd93..4fc8a150e6832a13f8477c9d7d244b1adc80a27b 100644 (file)
--- a/Lib/xmlrpc/server.py
+++ b/Lib/xmlrpc/server.py
@@ -956,8 +956,13 @@ class DocCGIXMLRPCRequestHandler(   CGIXMLRPCRequestHandler,
 
 
 if __name__ == '__main__':
-    print('Running XML-RPC server on port 8000')
     server = SimpleXMLRPCServer(("localhost", 8000))
     server.register_function(pow)
     server.register_function(lambda x,y: x+y, 'add')
-    server.serve_forever()
+    print('Serving XML-RPC on localhost port 8000')
+    try:
+        server.serve_forever()
+    except KeyboardInterrupt:
+        print("\nKeyboard interrupt received, exiting.")
+        server.server_close()
+        sys.exit(0)

diff --git a/Misc/NEWS b/Misc/NEWS
index b9e447ffa800e4ee487a89e02f7c330db32f1edf..381ceae8f4b6d7392ae1ac8ffa79ccb6c838597c 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -347,6 +347,9 @@ Core and Builtins
 Library
 -------
 
+- Fix the xmlrpc.client user agent to return something similar to
+  urllib.request user agent: "Python-xmlrpc/3.3".
+
 - Issue #13293: Better error message when trying to marshal bytes using
   xmlrpc.client.