diff --git a/CHANGELOG b/CHANGELOG index bc4419c2..946b9334 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -170,7 +170,7 @@ - Fixed an ugly traceback when a test class was imported from another module, but was missing a method. (#595) Patch by Michael Williamson. -- Fix formatFailure expection if missing tb in exc_info. (#603) +- Fix formatFailure exception if missing tb in exc_info. (#603) Patch by Sascha Peilicke. - Taught the test suite to skip coverage tests if the coverage module is not available. (#597) @@ -511,7 +511,7 @@ Lee for many bug reports. - Fixed bugs in rpm generation (Issue #96). Thanks to Mike Verdone for the bug report and http://bugs.python.org/issue644744 for the fix. -- Fixed inconsisent use of os.environ in plugin testing +- Fixed inconsistent use of os.environ in plugin testing utilities. Thanks to John J Lee for the bug report and patch (Issue #97). - Fixed bug in test_address that prevented use of nose.case.Test in @@ -638,7 +638,7 @@ - Fixed bug in handling of options from setup.cfg. Thanks to Kumar McMillan for the patch. - Fixed bug in generator methods, where a generator method using an inline - funciton would result in an AttributeError. Thanks to Antoine Pitrou for the + function would result in an AttributeError. Thanks to Antoine Pitrou for the bug report. - Updated coverage plugin to ignore lines tagged with #pragma: no cover, matching the behavior of coverage.py on the command line. Thanks to Bill diff --git a/NOTES b/NOTES index 85c48909..9015633f 100644 --- a/NOTES +++ b/NOTES @@ -4,7 +4,7 @@ is the selector useful? can it die, if we assume a more directed loading approach? The loader is the heart of the discovery system. It should be simple, clear, -and close to unittest's loader whereever possible. The complication comes from +and close to unittest's loader wherever possible. The complication comes from supporting proper fixture setup and teardown when the test name requested is a or is inside of a dotted module. Say we run like this: diff --git a/functional_tests/doc_tests/test_selector_plugin/selector_plugin.rst b/functional_tests/doc_tests/test_selector_plugin/selector_plugin.rst index f5f79138..2159f77e 100644 --- a/functional_tests/doc_tests/test_selector_plugin/selector_plugin.rst +++ b/functional_tests/doc_tests/test_selector_plugin/selector_plugin.rst @@ -7,7 +7,7 @@ the most part, if an object's name matches the ``testMatch`` regular expression defined in the active `nose.config.Config` instance, the object is selected as a test. -This behavior is fine for new projects, but may be undesireable for +This behavior is fine for new projects, but may be undesirable for older projects with a different test naming scheme. Fortunately, you can easily override this behavior by providing a custom selector using a plugin. diff --git a/functional_tests/test_multiprocessing/test_keyboardinterrupt.py b/functional_tests/test_multiprocessing/test_keyboardinterrupt.py index 18c8af11..faa581e2 100644 --- a/functional_tests/test_multiprocessing/test_keyboardinterrupt.py +++ b/functional_tests/test_multiprocessing/test_keyboardinterrupt.py @@ -36,7 +36,7 @@ def waitForKillFile(killfile): runner = os.path.join(support, 'fake_nosetest.py') def keyboardinterrupt(case): #os.setsid would create a process group so signals sent to the - #parent process will propogates to all children processes + #parent process will propagate to all children processes if not hasattr(os, 'setsid') or not hasattr(os, 'killpg'): raise SkipTest("OS does not support os.setsid or os.killpg") diff --git a/nose/ext/dtcompat.py b/nose/ext/dtcompat.py index 332cf08c..2e460549 100644 --- a/nose/ext/dtcompat.py +++ b/nose/ext/dtcompat.py @@ -401,7 +401,7 @@ class Example: zero-based, with respect to the beginning of the DocTest. - indent: The example's indentation in the DocTest string. - I.e., the number of space characters that preceed the + I.e., the number of space characters that precede the example's first prompt. - options: A dictionary mapping from option flags to True or @@ -1150,7 +1150,7 @@ def __run(self, test, compileflags, out): # Process each example. for examplenum, example in enumerate(test.examples): - # If REPORT_ONLY_FIRST_FAILURE is set, then supress + # If REPORT_ONLY_FIRST_FAILURE is set, then suppress # reporting after the first failure. quiet = (self.optionflags & REPORT_ONLY_FIRST_FAILURE and failures > 0) diff --git a/nose/plugins/base.py b/nose/plugins/base.py index f09beb69..f2cccaf0 100644 --- a/nose/plugins/base.py +++ b/nose/plugins/base.py @@ -110,7 +110,7 @@ def help(self): return textwrap.dedent(self.__class__.__doc__) return "(no help available)" - # Compatiblity shim + # Compatibility shim def tolist(self, val): warn("Plugin.tolist is deprecated. Use nose.util.tolist instead", DeprecationWarning) diff --git a/nose/plugins/doctests.py b/nose/plugins/doctests.py index 5ef65799..de666c07 100644 --- a/nose/plugins/doctests.py +++ b/nose/plugins/doctests.py @@ -382,7 +382,7 @@ def address(self): # doctests loaded via find(obj) omit the module name # so we need to override id, __repr__ and shortDescription - # bonus: this will squash a 2.3 vs 2.4 incompatiblity + # bonus: this will squash a 2.3 vs 2.4 incompatibility def id(self): name = self._dt_test.name filename = self._dt_test.filename diff --git a/nose/pyversion.py b/nose/pyversion.py index 091238da..802c6ba4 100644 --- a/nose/pyversion.py +++ b/nose/pyversion.py @@ -156,7 +156,7 @@ def isgenerator(o): try: from compiler.consts import CO_GENERATOR except ImportError: - # IronPython doesn't have a complier module + # IronPython doesn't have a compiler module CO_GENERATOR=0x20 def isgenerator(func): diff --git a/nose/twistedtools.py b/nose/twistedtools.py index 8d9c6ffe..101d93fa 100644 --- a/nose/twistedtools.py +++ b/nose/twistedtools.py @@ -72,7 +72,7 @@ def stop_reactor(): global _twisted_thread def stop_reactor(): - '''Helper for calling stop from withing the thread.''' + '''Helper for calling stop from within the thread.''' reactor.stop() reactor.callFromThread(stop_reactor) @@ -92,7 +92,7 @@ def deferred(timeout=None): The optional timeout parameter specifies the maximum duration of the test. The difference with timed() is that timed() will still wait for the test to end, while deferred() will stop the test when its timeout has expired. - The latter is more desireable when dealing with network tests, because + The latter is more desirable when dealing with network tests, because the result may actually never arrive. If the callback is triggered, the test has passed. diff --git a/nose/util.py b/nose/util.py index 80ab1d4e..3a96e5bf 100644 --- a/nose/util.py +++ b/nose/util.py @@ -116,7 +116,7 @@ def absfile(path, where=None): if path is None or not os.path.exists(path): return None if os.path.isdir(path): - # might want an __init__.py from pacakge + # might want an __init__.py from package init = os.path.join(path,'__init__.py') if os.path.isfile(init): return init