summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-09-11 17:33:26 -0400
committerBenjamin Peterson <benjamin@python.org>2014-09-11 17:33:26 -0400
commit217ba806c1def284f01316b557d89664d69af028 (patch)
treed5a7f08ad9b5773f0f20464913bc0471c92292b2
parentbb6b2fc6d81bcb114d66776b779258ec830a4390 (diff)
downloadsix-217ba806c1def284f01316b557d89664d69af028.tar.gz
add move for pipes.quote -> shlex.quote (fixes #90)
-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 b78b430..1af6cf3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,8 @@ This file lists the changes in each six version.
Development version
-------------------
+- Issue #90: Add six.moves.shlex_quote.
+
- Issue #59: Add six.moves.intern.
- Add six.urllib.parse.uses_(fragment|netloc|params|query|relative).
diff --git a/documentation/index.rst b/documentation/index.rst
index 23c5c72..0adadc2 100644
--- a/documentation/index.rst
+++ b/documentation/index.rst
@@ -531,6 +531,8 @@ Supported renames:
+------------------------------+-------------------------------------+-------------------------------------+
| ``reprlib`` | :mod:`py2:repr` | :mod:`py3:reprlib` |
+------------------------------+-------------------------------------+-------------------------------------+
+| ``shlex_quote`` | :mod:`py2:pipes.quote` | :mod:`py3:shlex.quote` |
++------------------------------+-------------------------------------+-------------------------------------+
| ``socketserver`` | :mod:`py2:SocketServer` | :mod:`py3:socketserver` |
+------------------------------+-------------------------------------+-------------------------------------+
| ``_thread`` | :mod:`py2:thread` | :mod:`py3:_thread` |
diff --git a/six.py b/six.py
index f88b39c..ff4571d 100644
--- a/six.py
+++ b/six.py
@@ -232,6 +232,7 @@ _moved_attributes = [
MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"),
MovedAttribute("reload_module", "__builtin__", "imp", "reload"),
MovedAttribute("reduce", "__builtin__", "functools"),
+ MovedAttribute("shlex_quote", "pipes", "shlex", "quote"),
MovedAttribute("StringIO", "StringIO", "io"),
MovedAttribute("UserDict", "UserDict", "collections"),
MovedAttribute("UserList", "UserList", "collections"),