summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Foord <michael@voidspace.org.uk>2012-10-07 18:33:12 +0100
committerMichael Foord <michael@voidspace.org.uk>2012-10-07 18:33:12 +0100
commitfcdebb7e690efcfafa062ef1d911ad73555cbcbb (patch)
tree5316c93280b0838b2815ae70fc0af769f19858df
parenta1e169b895a82806666be0cbb78ca44ceb8b4080 (diff)
downloadmock-fcdebb7e690efcfafa062ef1d911ad73555cbcbb.tar.gz
Doc updates for 1.0
-rw-r--r--README.txt4
-rw-r--r--docs/changelog.txt4
-rw-r--r--docs/index.txt4
3 files changed, 10 insertions, 2 deletions
diff --git a/README.txt b/README.txt
index 93ee824..385db3c 100644
--- a/README.txt
+++ b/README.txt
@@ -2,6 +2,10 @@ mock is a library for testing in Python. It allows you to replace parts of
your system under test with mock objects and make assertions about how they
have been used.
+mock is now part of the Python standard library, available as `unittest.mock <
+http://docs.python.org/py3k/library/unittest.mock.html#module-unittest.mock>`_
+in Python 3.3 onwards.
+
mock provides a core `MagicMock` class removing the need to create a host of
stubs throughout your test suite. After performing an action, you can make
assertions about which methods / attributes were used and arguments they were
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 06a5080..a605be3 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -8,8 +8,8 @@ CHANGELOG
------------------------
No changes since 1.0.0 beta 1. This version has feature parity with
-`unittest.mock <
-http://docs.python.org/py3k/library/unittest.mock.html#module-unittest.mock>`_
+`unittest.mock
+<http://docs.python.org/py3k/library/unittest.mock.html#module-unittest.mock>`_
in Python 3.3.
Full list of changes since 0.8:
diff --git a/docs/index.txt b/docs/index.txt
index 6705f69..7e4a8da 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -33,6 +33,10 @@ mock is a library for testing in Python. It allows you to replace parts of
your system under test with mock objects and make assertions about how they
have been used.
+mock is now part of the Python standard library, available as `unittest.mock
+<http://docs.python.org/py3k/library/unittest.mock.html#module-unittest.mock>`_
+in Python 3.3 onwards.
+
mock provides a core :class:`Mock` class removing the need to create a host
of stubs throughout your test suite. After performing an action, you can make
assertions about which methods / attributes were used and arguments they were