summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew M. Kuchling <amk@amk.ca>2009-04-09 11:23:36 (GMT)
committerAndrew M. Kuchling <amk@amk.ca>2009-04-09 11:23:36 (GMT)
commit5963185b2329856e94abe851fb2333f6bcee4347 (patch)
tree28637292806877cb972ab712d95ba0764224f217
parent24520b436520fae0b4519f9192bda6ac78d8e3f5 (diff)
downloadcpython-5963185b2329856e94abe851fb2333f6bcee4347.zip
cpython-5963185b2329856e94abe851fb2333f6bcee4347.tar.gz
cpython-5963185b2329856e94abe851fb2333f6bcee4347.tar.bz2
Typo fixes
-rw-r--r--Doc/library/unittest.rst12
-rw-r--r--Misc/NEWS2
2 files changed, 7 insertions, 7 deletions
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 4f4459c..e24f37b 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -690,7 +690,7 @@ Test cases
assertLessEqual(first, second, msg=None)
Test that *first* is respectively >, >=, < or <= than *second* depending
- on the method name. If not, the test will fail with the nice explanation
+ on the method name. If not, the test will fail with an explanation
or with the explanation given by *msg*::
>>> self.assertGreaterEqual(3, 4)
@@ -723,7 +723,7 @@ Test cases
.. method:: assertIn(first, second, msg=None)
assertNotIn(first, second, msg=None)
- Tests that *first* is or is not in *second* with a nice explanitory error
+ Tests that *first* is or is not in *second* with an explanatory error
message as appropriate.
If specified *msg* will be used as the error message on failure.
@@ -767,7 +767,7 @@ Test cases
.. method:: assertDictContainsSubset(expected, actual, msg=None)
- Tests whether the key value pairs in dictionary *actual* are a
+ Tests whether the key/value pairs in dictionary *actual* are a
superset of those in *expected*. If not, an error message listing
the missing keys and mismatched values is generated.
@@ -969,12 +969,12 @@ Test cases
been asked to compare are exactly *typeobj* (not subclasses).
*function* must take two positional arguments and a third msg=None
keyword argument just as :meth:`assertEqual` does. It must raise
- self.failureException when inequality between the first two
+ ``self.failureException`` when inequality between the first two
parameters is detected.
One good use of custom equality checking functions for a type
- is to raise self.failureException with an error message useful
- for debugging the by explaining the inequalities in detail.
+ is to raise ``self.failureException`` with an error message useful
+ for debugging the problem by explaining the inequalities in detail.
.. versionadded:: 2.7
diff --git a/Misc/NEWS b/Misc/NEWS
index 78b37cc..5fcfab9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -239,7 +239,7 @@ Library
mailbox.MH.get_message().
- Issue #5585: Add the ability to call an initializer to mulitiprocessing.manager
- so that users can install custonm handlers/etc.
+ so that users can install custom handlers/etc.
- Issue #3551: Patch multiprocessing to raise a proper exception if the size of the
object when writefile is called causes a ERROR_NO_SYSTEM_RESOURCES. Added docs