summaryrefslogtreecommitdiff
path: root/Lib/unittest
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2016-01-15 09:54:16 -0800
committerBrett Cannon <brett@python.org>2016-01-15 09:54:16 -0800
commit5a344ee9bdccf21b9bd590f111d5305f4a182aa9 (patch)
treee979019cef0802c16705c7906d5715018f28b82c /Lib/unittest
parent6aa13bc452026d45694a4e0d0803287b63c028b5 (diff)
parent9b11cf2be1be7c0fd245e6871b0c61a6f8a1a197 (diff)
downloadcpython-5a344ee9bdccf21b9bd590f111d5305f4a182aa9.tar.gz
Merge 'used with permission' additions
Diffstat (limited to 'Lib/unittest')
-rw-r--r--Lib/unittest/mock.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py
index 976f663c0a..21f49fab1b 100644
--- a/Lib/unittest/mock.py
+++ b/Lib/unittest/mock.py
@@ -820,7 +820,7 @@ class NonCallableMock(Base):
if expected not in all_calls:
raise AssertionError(
'Calls not found.\nExpected: %r\n'
- 'Actual: %r' % (calls, self.mock_calls)
+ 'Actual: %r' % (_CallList(calls), self.mock_calls)
) from cause
return