summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-01-18 23:01:45 -0500
committerBenjamin Peterson <benjamin@python.org>2014-01-18 23:01:45 -0500
commit49b92c473bc9aefc7ffac334a2ad2b67a3e89971 (patch)
tree49dba0264daa1af5c883fc43b036cf95028e6c90
parent90aa78cdf28a404171e05dc9665956bb942b27c7 (diff)
downloadsix-49b92c473bc9aefc7ffac334a2ad2b67a3e89971.tar.gz
add mapping for xmlrpc.server (fixes #55)
-rw-r--r--CHANGES1
-rw-r--r--documentation/index.rst2
-rw-r--r--six.py1
3 files changed, 4 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index eece7cf..c46e51f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ This file lists the changes in each six version.
Development version
-------------------
+- Issue #55: Add move mapping for xmlrpc.server.
1.5.2
-----
diff --git a/documentation/index.rst b/documentation/index.rst
index 50f3456..ec40b9d 100644
--- a/documentation/index.rst
+++ b/documentation/index.rst
@@ -569,6 +569,8 @@ Supported renames:
+------------------------------+-------------------------------------+-------------------------------------+
| ``xmlrpc_client`` | :mod:`py2:xmlrpclib` | :mod:`py3:xmlrpclib` |
+------------------------------+-------------------------------------+-------------------------------------+
+| ``xmlrpc_server`` | :mod:`py2:SimpleXMLRPCServer` | :mod:`py3:xmlrpc.server` |
++------------------------------+-------------------------------------+-------------------------------------+
| ``xrange`` | :func:`py2:xrange` | :func:`py3:range` |
+------------------------------+-------------------------------------+-------------------------------------+
| ``zip`` | :func:`py2:itertools.izip` | :func:`py3:zip` |
diff --git a/six.py b/six.py
index 7ec7f1b..7324b88 100644
--- a/six.py
+++ b/six.py
@@ -222,6 +222,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("winreg", "_winreg"),
]
for attr in _moved_attributes: