From d869cc41fee81e02f2b75a57f7e8921916c40d05 Mon Sep 17 00:00:00 2001 From: Donal Mee Date: Thu, 17 Dec 2020 11:37:47 +0000 Subject: [PATCH] Add six.moves.unittest_mock --- CHANGES | 5 +++++ CONTRIBUTORS | 1 + documentation/index.rst | 2 ++ six.py | 3 ++- 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index ad4cbaa14..ef7dfde8e 100644 --- a/CHANGES +++ b/CHANGES @@ -3,6 +3,11 @@ Changelog for six This file lists the changes in each six version. +1.16.0 +------ + +- Pull request #345: Add `six.moves.unittest.mock` + 1.15.0 ------ diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 4480c34b1..2e21e2f7a 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -25,6 +25,7 @@ Hugo van Kemenade Anselm Kruis Ivan Levkivskyi Alexander Lukanin +Donal Mee James Mills Jordan Moldow Berker Peksag diff --git a/documentation/index.rst b/documentation/index.rst index 45390b81b..7608573e8 100644 --- a/documentation/index.rst +++ b/documentation/index.rst @@ -689,6 +689,8 @@ Supported renames: +------------------------------+-------------------------------------+---------------------------------------+ | ``tkinter_tksimpledialog`` | :mod:`py2:tkSimpleDialog` | :mod:`py3:tkinter.simpledialog` | +------------------------------+-------------------------------------+---------------------------------------+ +| ``unittest_mock`` | :mod:`py2:mock` | :mod:`py3:urllib.mock` | ++------------------------------+-------------------------------------+---------------------------------------+ | ``urllib.parse`` | See :mod:`six.moves.urllib.parse` | :mod:`py3:urllib.parse` | +------------------------------+-------------------------------------+---------------------------------------+ | ``urllib.error`` | See :mod:`six.moves.urllib.error` | :mod:`py3:urllib.error` | diff --git a/six.py b/six.py index 83f69783d..cf277bd38 100644 --- a/six.py +++ b/six.py @@ -29,7 +29,7 @@ import types __author__ = "Benjamin Peterson " -__version__ = "1.15.0" +__version__ = "1.16.0" # Useful for very coarse version differentiation. @@ -296,6 +296,7 @@ class _MovedItems(_LazyModule): MovedModule("tkinter_messagebox", "tkMessageBox", "tkinter.messagebox"), MovedModule("tkinter_tksimpledialog", "tkSimpleDialog", "tkinter.simpledialog"), + MovedModule("unittest_mock", "mock", "unittest.mock"), MovedModule("urllib_parse", __name__ + ".moves.urllib_parse", "urllib.parse"), MovedModule("urllib_error", __name__ + ".moves.urllib_error", "urllib.error"), MovedModule("urllib", __name__ + ".moves.urllib", __name__ + ".moves.urllib"),