[Python-checkins] cpython (merge 3.3 -> default): Close #20759: Fix some typos in the mock docs. (Merge with 3.3)

zach.ware python-checkins at python.org
Wed Feb 26 16:39:07 CET 2014


http://hg.python.org/cpython/rev/42ef1c82d645
changeset:   89399:42ef1c82d645
parent:      89397:4236cbe85f68
parent:      89398:045f048cc116
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Wed Feb 26 09:38:39 2014 -0600
summary:
  Close #20759: Fix some typos in the mock docs. (Merge with 3.3)

files:
  Doc/library/unittest.mock-examples.rst |  2 +-
  Doc/library/unittest.mock.rst          |  4 ++--
  2 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/library/unittest.mock-examples.rst b/Doc/library/unittest.mock-examples.rst
--- a/Doc/library/unittest.mock-examples.rst
+++ b/Doc/library/unittest.mock-examples.rst
@@ -426,7 +426,7 @@
 
 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
--- a/Doc/library/unittest.mock.rst
+++ b/Doc/library/unittest.mock.rst
@@ -958,7 +958,7 @@
 
 .. [#] 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 @@
 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>`_.
 
 

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list