summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2014-02-26 15:38:39 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2014-02-26 15:38:39 (GMT)
commit984689821d757c080cd08eeae8f20fe58bfd5b6f (patch)
treed9c8eacfbb6cf03b90c75631cc21469e77e9d0fb /Doc
parent658103f84ea860888f8dab9615281ea64fee31b9 (diff)
parent5ea5d2c3f7ac3a308091bbbf11ab4f473571a628 (diff)
downloadcpython-984689821d757c080cd08eeae8f20fe58bfd5b6f.zip
cpython-984689821d757c080cd08eeae8f20fe58bfd5b6f.tar.gz
cpython-984689821d757c080cd08eeae8f20fe58bfd5b6f.tar.bz2
Close #20759: Fix some typos in the mock docs. (Merge with 3.3)
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/unittest.mock-examples.rst2
-rw-r--r--Doc/library/unittest.mock.rst4
2 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/unittest.mock-examples.rst b/Doc/library/unittest.mock-examples.rst
index 98bfcc5..c5fa365 100644
--- a/Doc/library/unittest.mock-examples.rst
+++ b/Doc/library/unittest.mock-examples.rst
@@ -426,7 +426,7 @@ mock using the "as" form of the with statement:
As an alternative `patch`, `patch.object` and `patch.dict` can be used as
class decorators. When used in this way it is the same as applying the
-decorator indvidually to every method whose name starts with "test".
+decorator individually to every method whose name starts with "test".
.. _further-examples:
diff --git a/Doc/library/unittest.mock.rst b/Doc/library/unittest.mock.rst
index b5cf7b5..cb72a68 100644
--- a/Doc/library/unittest.mock.rst
+++ b/Doc/library/unittest.mock.rst
@@ -958,7 +958,7 @@ method:
.. [#] The only exceptions are magic methods and attributes (those that have
leading and trailing double underscores). Mock doesn't create these but
- instead of raises an ``AttributeError``. This is because the interpreter
+ instead raises an ``AttributeError``. This is because the interpreter
will often implicitly request these methods, and gets *very* confused to
get a new Mock object when it expects a magic method. If you need magic
method support see :ref:`magic methods <magic-methods>`.
@@ -1509,7 +1509,7 @@ Patching Descriptors and Proxy Objects
Both patch_ and patch.object_ correctly patch and restore descriptors: class
methods, static methods and properties. You should patch these on the *class*
rather than an instance. They also work with *some* objects
-that proxy attribute access, like the `django setttings object
+that proxy attribute access, like the `django settings object
<http://www.voidspace.org.uk/python/weblog/arch_d7_2010_12_04.shtml#e1198>`_.