summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-09-11 17:28:15 -0400
committerBenjamin Peterson <benjamin@python.org>2014-09-11 17:28:15 -0400
commitbb6b2fc6d81bcb114d66776b779258ec830a4390 (patch)
tree88787749e67da3dd5af160f05c4dac9c1b937096
parente4c848983ef9bc79802aa0c8d7ba4c8c78685c65 (diff)
downloadsix-bb6b2fc6d81bcb114d66776b779258ec830a4390.tar.gz
moves mapping for intern (fixes #59)
-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 4bce92b..b78b430 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,8 @@ This file lists the changes in each six version.
Development version
-------------------
+- Issue #59: Add six.moves.intern.
+
- Add six.urllib.parse.uses_(fragment|netloc|params|query|relative).
- Issue #88: Fix add_metaclass when the class has __slots__ containing
diff --git a/documentation/index.rst b/documentation/index.rst
index 9acea50..23c5c72 100644
--- a/documentation/index.rst
+++ b/documentation/index.rst
@@ -517,6 +517,8 @@ Supported renames:
+------------------------------+-------------------------------------+-------------------------------------+
| ``input`` | :func:`py2:raw_input` | :func:`py3:input` |
+------------------------------+-------------------------------------+-------------------------------------+
+| ``intern`` | :func:`py2:intern` | :func:`py3:sys.intern` |
++------------------------------+-------------------------------------+-------------------------------------+
| ``map`` | :func:`py2:itertools.imap` | :func:`py3:map` |
+------------------------------+-------------------------------------+-------------------------------------+
| ``queue`` | :mod:`py2:Queue` | :mod:`py3:queue` |
diff --git a/six.py b/six.py
index 12a071b..f88b39c 100644
--- a/six.py
+++ b/six.py
@@ -227,6 +227,7 @@ _moved_attributes = [
MovedAttribute("filter", "itertools", "builtins", "ifilter", "filter"),
MovedAttribute("filterfalse", "itertools", "itertools", "ifilterfalse", "filterfalse"),
MovedAttribute("input", "__builtin__", "builtins", "raw_input", "input"),
+ MovedAttribute("intern", "__builtin__", "sys"),
MovedAttribute("map", "itertools", "builtins", "imap", "map"),
MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"),
MovedAttribute("reload_module", "__builtin__", "imp", "reload"),