summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2013-10-14 10:08:41 -0400
committerBenjamin Peterson <benjamin@python.org>2013-10-14 10:08:41 -0400
commitc2312c1c26a9c68d4c7dad96eba5b39695adbd3f (patch)
tree9c892a6507a784f5327f896bbe32e78a5d12774d
parent7047a0bfadc534412cc87ba77dc2c1b07e445327 (diff)
downloadsix-c2312c1c26a9c68d4c7dad96eba5b39695adbd3f.tar.gz
import mapping for xmlrpclib (fixes #43)
-rw-r--r--CHANGES2
-rw-r--r--documentation/index.rst2
-rw-r--r--six.py1
3 files changed, 5 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 73c38a9..6ef6813 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,8 @@ This file lists the changes in each six version.
Development version
-------------------
+- Issue #43: Add import mapping for the Python 2 xmlrpclib module.
+
- Issue #39: Add import mapping for the Python 2 thread module.
- Issue #40: Add import mapping for the Python 2 gdbm module.
diff --git a/documentation/index.rst b/documentation/index.rst
index 91bb5b9..ee8b60d 100644
--- a/documentation/index.rst
+++ b/documentation/index.rst
@@ -544,6 +544,8 @@ Supported renames:
+------------------------------+-------------------------------------+-------------------------------------+
| ``winreg`` | :mod:`py2:_winreg` | :mod:`py3:winreg` |
+------------------------------+-------------------------------------+-------------------------------------+
+| ``xmlrpc_client`` | :mod:`py2:xmlrpclib` | :mod:`py3:xmlrpclib` |
++------------------------------+-------------------------------------+-------------------------------------+
| ``xrange`` | :func:`py2:xrange` | :func:`py3:range` |
+------------------------------+-------------------------------------+-------------------------------------+
| ``zip`` | :func:`py2:itertools.izip` | :func:`py3:zip` |
diff --git a/six.py b/six.py
index f3a572c..176196c 100644
--- a/six.py
+++ b/six.py
@@ -191,6 +191,7 @@ _moved_attributes = [
MovedModule("urllib_error", __name__ + ".moves.urllib_error", "urllib.error"),
MovedModule("urllib", __name__ + ".moves.urllib", __name__ + ".moves.urllib"),
MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"),
+ MovedModule("xmlrpc_client", "xmlrpclib", "xmlrpc.client"),
MovedModule("winreg", "_winreg"),
]
for attr in _moved_attributes: