summaryrefslogtreecommitdiffstats
path: root/Doc/library/unittest.mock-examples.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-10-29 09:27:06 (GMT)
committerGeorg Brandl <georg@python.org>2014-10-29 09:27:06 (GMT)
commit794e9bf1fe5bd0000f90c1502b16c96eb68a59af (patch)
tree0fe2b5742d9d244ffac97dc7b4928ee29eefe370 /Doc/library/unittest.mock-examples.rst
parent9e67d801bdef7c43e6704200770fb9cf2040dc11 (diff)
parent525d355984e1afa342aa72fc7867a56eea937a61 (diff)
downloadcpython-794e9bf1fe5bd0000f90c1502b16c96eb68a59af.zip
cpython-794e9bf1fe5bd0000f90c1502b16c96eb68a59af.tar.gz
cpython-794e9bf1fe5bd0000f90c1502b16c96eb68a59af.tar.bz2
merge with 3.4
Diffstat (limited to 'Doc/library/unittest.mock-examples.rst')
-rw-r--r--Doc/library/unittest.mock-examples.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/unittest.mock-examples.rst b/Doc/library/unittest.mock-examples.rst
index 7963237..0a3cfb6 100644
--- a/Doc/library/unittest.mock-examples.rst
+++ b/Doc/library/unittest.mock-examples.rst
@@ -549,7 +549,7 @@ Calls to the date constructor are recorded in the `mock_date` attributes
An alternative way of dealing with mocking dates, or other builtin classes,
is discussed in `this blog entry
-<http://williamjohnbert.com/2011/07/how-to-unit-testing-in-django-with-mocking-and-patching/>`_.
+<http://www.williamjohnbert.com/2011/07/how-to-unit-testing-in-django-with-mocking-and-patching/>`_.
Mocking a Generator Method
@@ -1254,4 +1254,4 @@ As of version 1.5, the Python testing library `PyHamcrest
<https://pypi.python.org/pypi/PyHamcrest>`_ provides similar functionality,
that may be useful here, in the form of its equality matcher
(`hamcrest.library.integration.match_equality
-<http://pythonhosted.org/PyHamcrest/integration.html#hamcrest.library.integration.match_equality>`_).
+<http://pythonhosted.org/PyHamcrest/integration.html#hamcrest.library.integration.match_equality.match_equality>`_).