summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-06-13 22:04:58 -0700
committerBenjamin Peterson <benjamin@python.org>2014-06-13 22:04:58 -0700
commite8a1a60a87ffa293aa6b1eeda2496cb5ca36971c (patch)
tree781901ee984a94b188bcf8fb582691fc9696b9b8
parentf3f3f9f9577049bb9287310e38490dccaae3fe91 (diff)
downloadsix-e8a1a60a87ffa293aa6b1eeda2496cb5ca36971c.tar.gz
xmlrpc_server should map to SimpleXMLRPCServer on Python 2 (fixes #74)
-rw-r--r--CHANGES3
-rw-r--r--six.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 0b2f58f..bb3143b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@ This file lists the changes in each six version.
Development version
-------------------
+- Issue #74: six.moves.xmlrpc_server should map to SimpleXMLRPCServer on Python
+ 2 as documented not xmlrpclib.
+
1.7.2
-----
diff --git a/six.py b/six.py
index 55f5c3b..940f46c 100644
--- a/six.py
+++ b/six.py
@@ -281,7 +281,7 @@ _moved_attributes = [
MovedModule("urllib", __name__ + ".moves.urllib", __name__ + ".moves.urllib"),
MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"),
MovedModule("xmlrpc_client", "xmlrpclib", "xmlrpc.client"),
- MovedModule("xmlrpc_server", "xmlrpclib", "xmlrpc.server"),
+ MovedModule("xmlrpc_server", "SimpleXMLRPCServer", "xmlrpc.server"),
MovedModule("winreg", "_winreg"),
]
for attr in _moved_attributes: