Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typos #999

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -238,7 +238,7 @@
Andrey Golovizin.
- Add --cover-min-percentage flag to force test runs without sufficient
coverage to fail (#540). Patch by Domen Kožar.
- Add travis-ci configuraion (#545). Patch by Domen Kožar.
- Add travis-ci configuration (#545). Patch by Domen Kožar.
- Call reactor.stop from twisted thread (#301). Patch by Adi Roiban.


Expand Down Expand Up @@ -455,7 +455,7 @@
- Fixed bug in capture plugin that caused it to record captured output
on the test in the wrong attribute (#113).
- Fixed bug in result proxy that caused tests to fail if they accessed
certain result attibutes directly (#114). Thanks to Neilen Marais
certain result attributes directly (#114). Thanks to Neilen Marais
for the bug report.
- Fixed bug in capture plugin that caused other error formatters
changes to be lost if no output was captured (#124). Thanks to
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -815,7 +815,7 @@
- Fix bug where sys.path would not be set up correctly when running some
tests, producing spurious import errors (Thanks to Titus Brown and Mike
Thomson for the bug reports)
- For test classses not derived from unittest.TestCase, output (module.Class)
- For test classes not derived from unittest.TestCase, output (module.Class)
"doc string" as test description, when method doc string is available
(Thanks to David Keeney for the suggestion, even if this isn't quite what he
meant)
Expand Down
2 changes: 1 addition & 1 deletion NOTES
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
4 changes: 2 additions & 2 deletions README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ removed:
verbosity=3
with-doctest=1

There is also possiblity to disable configuration files loading (might
be useful when runnig i.e. tox and you don't want your global nose
There is also possibility to disable configuration files loading (might
be useful when running i.e. tox and you don't want your global nose
config file to be used by tox). In order to ignore those configuration
files simply set an environment variable "NOSE_IGNORE_CONFIG_FILES".

Expand Down
2 changes: 1 addition & 1 deletion distribute_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ def _rename_path(path):

def _remove_flat_installation(placeholder):
if not os.path.isdir(placeholder):
log.warn('Unkown installation at %s', placeholder)
log.warn('Unknown installation at %s', placeholder)
return False
found = False
for file in os.listdir(placeholder):
Expand Down
4 changes: 2 additions & 2 deletions doc/usage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ standard .ini-style config files. Put your nosetests configuration in a
verbosity=3
with-doctest=1

There is also possiblity to disable configuration files loading (might be
useful when runnig i.e. tox and you don't want your global nose config file to
There is also possibility to disable configuration files loading (might be
useful when running i.e. tox and you don't want your global nose config file to
be used by tox). In order to ignore those configuration files simply set an
environment variable ``NOSE_IGNORE_CONFIG_FILES``.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 propagates 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")

Expand Down
2 changes: 1 addition & 1 deletion nose/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def run(self):
"""ensure tests are capable of being run, then
run nose.main with a reconstructed argument list"""
if getattr(self.distribution, 'use_2to3', False):
# If we run 2to3 we can not do this inplace:
# If we run 2to3 we cannot do this inplace:

# Ensure metadata is up-to-date
build_py = self.get_finalized_command('build_py')
Expand Down
2 changes: 1 addition & 1 deletion nose/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"~/nose.cfg"
]

# plaforms on which the exe check defaults to off
# platforms on which the exe check defaults to off
# Windows and IronPython
exe_allowed_platforms = ('win32', 'cli')

Expand Down
6 changes: 3 additions & 3 deletions nose/ext/dtcompat.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -831,7 +831,7 @@ def find(self, obj, name=None, module=None, globs=None,
if extraglobs is not None:
globs.update(extraglobs)

# Recursively expore `obj`, extracting DocTests.
# Recursively explore `obj`, extracting DocTests.
tests = []
self._find(tests, obj, name, module, source_lines, globs, {})
# Sort the tests by alpha order of names, for consistency in
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion nose/plugins/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions nose/plugins/doctests.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ class Doctest(Plugin):
suiteClass = DoctestSuite

def options(self, parser, env):
"""Register commmandline options.
"""Register commandline options.
"""
Plugin.options(self, parser, env)
parser.add_option('--doctest-tests', action='store_true',
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion nose/plugins/failuredetail.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class FailureDetail(Plugin):
score = 1600 # before capture

def options(self, parser, env):
"""Register commmandline options.
"""Register commandline options.
"""
parser.add_option(
"-d", "--detailed-errors", "--failure-detail",
Expand Down
4 changes: 2 additions & 2 deletions nose/plugins/multiprocess.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

The multiprocess plugin enables you to distribute your test run among a set of
worker processes that run tests in parallel. This can speed up CPU-bound test
runs (as long as the number of work processeses is around the number of
runs (as long as the number of work processes is around the number of
processors or cores available), but is mainly useful for IO-bound tests that
spend most of their time waiting for data to arrive from someplace else.

Expand Down Expand Up @@ -447,7 +447,7 @@ def run(self, test):
iworker,worker_addr)
w.currentaddr.value = bytes_('')
# If the process is in C++ code, sending a SIGILL
# might not send a python KeybordInterrupt exception
# might not send a python KeyboardInterrupt exception
# therefore, send multiple signals until an
# exception is caught. If this takes too long, then
# terminate the process
Expand Down
2 changes: 1 addition & 1 deletion nose/pyversion.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
4 changes: 2 additions & 2 deletions nose/twistedtools.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion nose/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions patch.py
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ def apply(self):

def can_patch(self, filename):
""" Check if specified filename can be patched. Returns None if file can
not be found among source filenames. False if patch can not be applied
not be found among source filenames. False if patch cannot be applied
clearly. True otherwise.

:returns: True, False or None
Expand Down Expand Up @@ -636,4 +636,4 @@ def _get_file_idx(self, filename, source=None):
patch.apply()

# todo: document and test line ends handling logic - patch.py detects proper line-endings
# for inserted hunks and issues a warning if patched file has incosistent line ends
# for inserted hunks and issues a warning if patched file has inconsistent line ends
2 changes: 1 addition & 1 deletion unit_tests/test_multiprocess.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def runTest(self):
pass

def test_mp_process_args_pickleable():
# TODO(Kumar) this test needs to be more succint.
# TODO(Kumar) this test needs to be more succinct.
# If you start seeing it timeout then perhaps we need to skip it again.
# raise SkipTest('this currently gets stuck in poll() 90% of the time')
test = case.Test(T('runTest'))
Expand Down