summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Ruibal <ruibalp@gmail.com>2014-04-16 15:52:26 -0700
committerPeter Ruibal <ruibalp@gmail.com>2014-04-16 15:52:26 -0700
commitc4c680e4e0fd8a2f9536c86d7fafbe3444bc50f2 (patch)
treef5b87d88bc3d25096e595b91819a7edb2a7a9ef9
parent20fa2f558da4fe12c9539511439f39cf8ad3f2e3 (diff)
downloadsix-c4c680e4e0fd8a2f9536c86d7fafbe3444bc50f2.tar.gz
Add moves for UserDict and UserList
See https://docs.python.org/2/library/userdict.html#module-UserDict for details
-rw-r--r--documentation/index.rst4
-rw-r--r--six.py2
2 files changed, 6 insertions, 0 deletions
diff --git a/documentation/index.rst b/documentation/index.rst
index 3d7828b..6d9b936 100644
--- a/documentation/index.rst
+++ b/documentation/index.rst
@@ -563,6 +563,10 @@ Supported renames:
+------------------------------+-------------------------------------+-------------------------------------+
| ``urllib_robotparser`` | :mod:`py2:robotparser` | :mod:`py3:urllib.robotparser` |
+------------------------------+-------------------------------------+-------------------------------------+
+| ``UserDict`` | :class:`py2:UserDict.UserDict` | :class:`py3:collections.UserDict` |
++------------------------------+-------------------------------------+-------------------------------------+
+| ``UserList`` | :class:`py2:UserList.UserList` | :class:`py3:collections.UserList` |
++------------------------------+-------------------------------------+-------------------------------------+
| ``UserString`` | :class:`py2:UserString.UserString` | :class:`py3:collections.UserString` |
+------------------------------+-------------------------------------+-------------------------------------+
| ``winreg`` | :mod:`py2:_winreg` | :mod:`py3:winreg` |
diff --git a/six.py b/six.py
index 6bc97c4..c8509a5 100644
--- a/six.py
+++ b/six.py
@@ -185,6 +185,8 @@ _moved_attributes = [
MovedAttribute("reload_module", "__builtin__", "imp", "reload"),
MovedAttribute("reduce", "__builtin__", "functools"),
MovedAttribute("StringIO", "StringIO", "io"),
+ MovedAttribute("UserDict", "UserDict", "collections"),
+ MovedAttribute("UserList", "UserList", "collections"),
MovedAttribute("UserString", "UserString", "collections"),
MovedAttribute("xrange", "__builtin__", "builtins", "xrange", "range"),
MovedAttribute("zip", "itertools", "builtins", "izip", "zip"),