From 80a7eaf0a5913a3d0ec1c6d7ecb4bb5b0cee10c0 Mon Sep 17 00:00:00 2001 From: Ben Bariteau Date: Fri, 27 Sep 2019 15:28:22 -0700 Subject: [PATCH 1/4] Add move for dbm->dbm.ndbm, refs #298 --- six.py | 1 + 1 file changed, 1 insertion(+) diff --git a/six.py b/six.py index 4c303ff97..7b6b42a81 100644 --- a/six.py +++ b/six.py @@ -257,6 +257,7 @@ class _MovedItems(_LazyModule): MovedModule("configparser", "ConfigParser"), MovedModule("copyreg", "copy_reg"), MovedModule("dbm_gnu", "gdbm", "dbm.gnu"), + MovedModule("ndbm", "dbm", "dbm.ndbm"), MovedModule("_dummy_thread", "dummy_thread", "_dummy_thread"), MovedModule("http_cookiejar", "cookielib", "http.cookiejar"), MovedModule("http_cookies", "Cookie", "http.cookies"), From 6a9201e9fe5cedd6dd128474c59a53a193f68f9a Mon Sep 17 00:00:00 2001 From: Ben Bariteau Date: Fri, 27 Sep 2019 15:29:56 -0700 Subject: [PATCH 2/4] Update docs for ndbm move --- documentation/index.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/documentation/index.rst b/documentation/index.rst index 675361700..3ae20b451 100644 --- a/documentation/index.rst +++ b/documentation/index.rst @@ -630,6 +630,8 @@ Supported renames: +------------------------------+-------------------------------------+---------------------------------------+ | ``map`` | :func:`py2:itertools.imap` | :func:`py3:map` | +------------------------------+-------------------------------------+---------------------------------------+ +| ``ndbm`` | :func:`py2:dbm` | :func:`py3:dbm.ndbm` | ++------------------------------+-------------------------------------+---------------------------------------+ | ``queue`` | :mod:`py2:Queue` | :mod:`py3:queue` | +------------------------------+-------------------------------------+---------------------------------------+ | ``range`` | :func:`py2:xrange` | :func:`py3:range` | From eaf48b3a359432fd1e16c2ec69ce1a4b4df9e47a Mon Sep 17 00:00:00 2001 From: Ben Bariteau Date: Mon, 4 Nov 2019 22:08:50 -0800 Subject: [PATCH 3/4] Change dbm.ndbm move to be consistent with dbm.gnu --- six.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/six.py b/six.py index 7b6b42a81..33d0af34a 100644 --- a/six.py +++ b/six.py @@ -257,7 +257,7 @@ class _MovedItems(_LazyModule): MovedModule("configparser", "ConfigParser"), MovedModule("copyreg", "copy_reg"), MovedModule("dbm_gnu", "gdbm", "dbm.gnu"), - MovedModule("ndbm", "dbm", "dbm.ndbm"), + MovedModule("dbm_ndbm", "dbm", "dbm.ndbm"), MovedModule("_dummy_thread", "dummy_thread", "_dummy_thread"), MovedModule("http_cookiejar", "cookielib", "http.cookiejar"), MovedModule("http_cookies", "Cookie", "http.cookies"), From ef7ebac7b5020e46f1eb2ae3338b52c2879a1492 Mon Sep 17 00:00:00 2001 From: Ben Bariteau Date: Mon, 4 Nov 2019 22:10:01 -0800 Subject: [PATCH 4/4] Update docs --- documentation/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/index.rst b/documentation/index.rst index 3ae20b451..3b1c2446e 100644 --- a/documentation/index.rst +++ b/documentation/index.rst @@ -586,6 +586,8 @@ Supported renames: +------------------------------+-------------------------------------+---------------------------------------+ | ``dbm_gnu`` | :func:`py2:gdbm` | :class:`py3:dbm.gnu` | +------------------------------+-------------------------------------+---------------------------------------+ +| ``dbm_ndbm`` | :func:`py2:dbm` | :func:`py3:dbm.ndbm` | ++------------------------------+-------------------------------------+---------------------------------------+ | ``_dummy_thread`` | :mod:`py2:dummy_thread` | :mod:`py3:_dummy_thread` | +------------------------------+-------------------------------------+---------------------------------------+ | ``email_mime_base`` | :mod:`py2:email.MIMEBase` | :mod:`py3:email.mime.base` | @@ -630,8 +632,6 @@ Supported renames: +------------------------------+-------------------------------------+---------------------------------------+ | ``map`` | :func:`py2:itertools.imap` | :func:`py3:map` | +------------------------------+-------------------------------------+---------------------------------------+ -| ``ndbm`` | :func:`py2:dbm` | :func:`py3:dbm.ndbm` | -+------------------------------+-------------------------------------+---------------------------------------+ | ``queue`` | :mod:`py2:Queue` | :mod:`py3:queue` | +------------------------------+-------------------------------------+---------------------------------------+ | ``range`` | :func:`py2:xrange` | :func:`py3:range` |