Hi, I applied the patch replacing unittest.mock with mock: Tulip (28ff4d7e888f), CPython (3a03a31a701c). I also merged changed into Trollius directly.
Victor 2014-02-25 18:25 GMT+01:00 Victor Stinner <[email protected]>: > 2014-02-25 17:31 GMT+01:00 Guido van Rossum <[email protected]>: >>> By the way, it would be nice to reduce the number of conflicts :-) >>> First, would it be possible to replace "unittest.mock" with "mock" in >>> all unit tests? In Python 2, there is no unittest.mock module, I use >>> the backport mock (or unittest.mock if available). So I would like to >>> write "from unittest import mock" and replace "unittest.mock" with >>> "mock" in Tulip unit tests. >> >> Sounds good. > > Here is a patch: > http://codereview.appspot.com/68620044 > > If you approve it, I will apply it to the default branch of Python as > well (will be Python 3.4.1).
