[Python-checkins] cpython (3.4): Issue #23568: Add rdivmod support to MagicMock() objects.

Sun Mar 15 00:57:41 CET 2015

https://hg.python.org/cpython/rev/35a780a9a3b4
changeset: 94994:35a780a9a3b4
branch: 3.4
parent: 94991:5f49f79d5a83
user: Berker Peksag <berker.peksag at gmail.com>
date: Sun Mar 15 01:51:56 2015 +0200
summary:
 Issue #23568: Add rdivmod support to MagicMock() objects.
Patch by Håkan Lövdahl.
files:
 Lib/unittest/mock.py | 4 ++-
 Lib/unittest/test/testmock/testmagicmethods.py | 15 ++++++++++
 Misc/NEWS | 3 ++
 3 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py
--- a/Lib/unittest/mock.py
+++ b/Lib/unittest/mock.py
@@ -1644,7 +1644,9 @@
 "len contains iter "
 "hash str sizeof "
 "enter exit "
- "divmod neg pos abs invert "
+ # we added divmod and rdivmod here instead of numerics
+ # because there is no idivmod
+ "divmod rdivmod neg pos abs invert "
 "complex int float index "
 "trunc floor ceil "
 "bool next "
diff --git a/Lib/unittest/test/testmock/testmagicmethods.py b/Lib/unittest/test/testmock/testmagicmethods.py
--- a/Lib/unittest/test/testmock/testmagicmethods.py
+++ b/Lib/unittest/test/testmock/testmagicmethods.py
@@ -424,5 +424,20 @@
 self.assertEqual(list(m), [])
 
 
+ def test_divmod_and_rdivmod(self):
+ m = MagicMock()
+ self.assertIsInstance(divmod(5, m), MagicMock)
+ m.__divmod__.return_value = (2, 1)
+ self.assertEqual(divmod(m, 2), (2, 1))
+ m = MagicMock()
+ foo = divmod(2, m)
+ self.assertIsInstance(foo, MagicMock)
+ foo_direct = m.__divmod__(2)
+ self.assertIsInstance(foo_direct, MagicMock)
+ bar = divmod(m, 2)
+ self.assertIsInstance(bar, MagicMock)
+ bar_direct = m.__rdivmod__(2)
+ self.assertIsInstance(bar_direct, MagicMock)
+
 if __name__ == '__main__':
 unittest.main()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -18,6 +18,9 @@
 Library
 -------
 
+- Issue #23568: Add rdivmod support to MagicMock() objects.
+ Patch by Håkan Lövdahl.
+
 - Issue #23138: Fixed parsing cookies with absent keys or values in cookiejar.
 Patch by Demian Brecht.
 
-- 
Repository URL: https://hg.python.org/cpython
