diff options
| -rw-r--r-- | coverage/backward.py | 1 | ||||
| -rw-r--r-- | coverage/parser.py | 2 | ||||
| -rw-r--r-- | doc/dict.txt | 11 | ||||
| -rw-r--r-- | igor.py | 10 | ||||
| -rw-r--r-- | tests/test_html.py | 14 | ||||
| -rw-r--r-- | tests/test_plugins.py | 2 | ||||
| -rw-r--r-- | tests/test_process.py | 2 | ||||
| -rw-r--r-- | tests/test_xml.py | 2 |
8 files changed, 27 insertions, 17 deletions
diff --git a/coverage/backward.py b/coverage/backward.py index fecb028a..5dbb411d 100644 --- a/coverage/backward.py +++ b/coverage/backward.py @@ -152,7 +152,6 @@ def import_local_file(modname): with open(modfile, 'r') as f: # pylint: disable=undefined-loop-variable - # (Using possibly undefined loop variable 'suff') mod = imp.load_module(modname, f, modfile, suff) return mod diff --git a/coverage/parser.py b/coverage/parser.py index 2841c6bb..a2b1b610 100644 --- a/coverage/parser.py +++ b/coverage/parser.py @@ -330,7 +330,7 @@ OPS_NO_JUMP = OPS_PUSH_BLOCK OP_BREAK_LOOP = _opcode('BREAK_LOOP') OP_END_FINALLY = _opcode('END_FINALLY') OP_COMPARE_OP = _opcode('COMPARE_OP') -COMPARE_EXCEPTION = 10 # just have to get this const from the code. +COMPARE_EXCEPTION = 10 # just have to get this constant from the code. OP_LOAD_CONST = _opcode('LOAD_CONST') OP_RETURN_VALUE = _opcode('RETURN_VALUE') diff --git a/doc/dict.txt b/doc/dict.txt index cf6a409f..8bed966a 100644 --- a/doc/dict.txt +++ b/doc/dict.txt @@ -4,6 +4,8 @@ apache API args argv +basename +basenames bitbucket BOM bom @@ -14,6 +16,7 @@ builtin builtins bytecode bytecodes +bytestring canonicalize canonicalized canonicalizes @@ -32,6 +35,7 @@ covhtml CPython css CTracer +datetime dedent dict dict's @@ -53,6 +57,7 @@ executable's expr filename filenames +filepath fname fnmatch fpath @@ -74,8 +79,10 @@ importlib instancemethod int ints +invariants iterable iterables +json jython kwargs matcher @@ -89,6 +96,7 @@ morf morfs multi mumbo +mycode namespace namespaces nano @@ -109,9 +117,12 @@ outfile overridable parsable parsers +pathnames pragma pragmas pre +prepended +prepending programmability programmatically py @@ -305,16 +305,16 @@ def do_help(): print("%-20s%s" % (name[3:], value.__doc__)) -def analyze_args(callble): - """What kind of args does `callble` expect? +def analyze_args(function): + """What kind of args does `function` expect? Returns: star, num_pos: - star(boolean): Does `callble` accept *args? - num_args(int): How many positional arguments does `callble` have? + star(boolean): Does `function` accept *args? + num_args(int): How many positional arguments does `function` have? """ with ignore_warnings(): - argspec = inspect.getargspec(callble) + argspec = inspect.getargspec(function) return bool(argspec[1]), len(argspec[0]) diff --git a/tests/test_html.py b/tests/test_html.py index fd22980e..f66dec64 100644 --- a/tests/test_html.py +++ b/tests/test_html.py @@ -356,16 +356,16 @@ class HtmlTest(HtmlTestHelpers, CoverageTest): cov.html_report() def test_extensionless_file_collides_with_extension(self): - # It used to be that "afile" and "afile.py" would both be reported to - # "afile.html". Now they are not. + # It used to be that "program" and "program.py" would both be reported + # to "program.html". Now they are not. # https://bitbucket.org/ned/coveragepy/issue/69 - self.make_file("afile", "import afile\n") - self.make_file("afile.py", "a = 1\n") - self.run_command("coverage run afile") + self.make_file("program", "import program\n") + self.make_file("program.py", "a = 1\n") + self.run_command("coverage run program") self.run_command("coverage html") self.assert_exists("htmlcov/index.html") - self.assert_exists("htmlcov/afile.html") - self.assert_exists("htmlcov/afile_py.html") + self.assert_exists("htmlcov/program.html") + self.assert_exists("htmlcov/program_py.html") def test_has_date_stamp_in_files(self): self.create_initial_files() diff --git a/tests/test_plugins.py b/tests/test_plugins.py index db987039..18b662f7 100644 --- a/tests/test_plugins.py +++ b/tests/test_plugins.py @@ -512,7 +512,7 @@ class BadPluginTest(FileTracerTest): # The message can be in two forms: # Disabling plugin '...' due to previous exception # or: - # Disabling plugin '...' due to an excepton: + # Disabling plugin '...' due to an exception: msg = "Disabling plugin '%s.%s' due to " % (module_name, plugin_name) warnings = stderr.count(msg) self.assertEqual(warnings, 1) diff --git a/tests/test_process.py b/tests/test_process.py index 4fe22a0f..3a05eaa5 100644 --- a/tests/test_process.py +++ b/tests/test_process.py @@ -768,7 +768,7 @@ def possible_pth_dirs(): class ProcessCoverageMixin(object): - """Set up a .pth file that causes all sub-processes to be coverage'd""" + """Set up a .pth file to coverage-measure all sub-processes.""" def setUp(self): super(ProcessCoverageMixin, self).setUp() diff --git a/tests/test_xml.py b/tests/test_xml.py index 8ba92d69..af4ecee7 100644 --- a/tests/test_xml.py +++ b/tests/test_xml.py @@ -33,7 +33,7 @@ class XmlTestHelpers(CoverageTest): Makes `width` directories, named d0 .. d{width-1}. Each directory has __init__.py, and `width` files, named f0.py .. f{width-1}.py. Each - directory also has `width` subdirectories, in the same fashion, until + directory also has `width` sub-directories, in the same fashion, until a depth of `depth` is reached. """ |