| commit | be55566c25be5af76247acb92ae43567426154ce | [log] [tgz] |
|---|---|---|
| author | Michael Foord <michael@voidspace.org.uk> | Wed Mar 14 12:59:08 2012 -0700 |
| committer | Michael Foord <michael@voidspace.org.uk> | Wed Mar 14 12:59:08 2012 -0700 |
| tree | 32263f3b5ab2f72927c60ad8e4af844850a4ea45 | |
| parent | 83a16856ee1db8eb49a08c4492ece8239ffb5819 [diff] | |
| parent | db66eba288137fdbdeeac57c8775e53fc2d7b822 [diff] |
Merge
diff --git a/Lib/unittest/test/testmock/testmock.py b/Lib/unittest/test/testmock/testmock.py index 07d8cbd..ae9822e 100644 --- a/Lib/unittest/test/testmock/testmock.py +++ b/Lib/unittest/test/testmock/testmock.py
@@ -32,7 +32,7 @@ # if __all__ is badly defined then import * will raise an error # We have to exec it because you can't import * inside a method # in Python 3 - exec("from mock import *") + exec("from unittest.mock import *") def test_constructor(self):