diff options
| -rw-r--r-- | coverage/control.py | 2 | ||||
| -rw-r--r-- | coverage/html.py | 3 | ||||
| -rw-r--r-- | coverage/misc.py | 2 | ||||
| -rw-r--r-- | coverage/parser.py | 2 | ||||
| -rw-r--r-- | coverage/test_helpers.py | 4 | ||||
| -rw-r--r-- | doc/dict.txt | 8 | ||||
| -rw-r--r-- | setup.py | 4 | ||||
| -rw-r--r-- | tests/test_coverage.py | 10 | ||||
| -rw-r--r-- | tests/test_data.py | 2 | ||||
| -rw-r--r-- | tests/test_farm.py | 2 |
10 files changed, 25 insertions, 14 deletions
diff --git a/coverage/control.py b/coverage/control.py index d74aa888..fde6f63b 100644 --- a/coverage/control.py +++ b/coverage/control.py @@ -275,7 +275,7 @@ class Coverage(object): self.data = CoverageData(debug=self.debug) self.data_files = CoverageDataFiles(basename=self.config.data_file) - # The dirs for files considered "installed with the interpreter". + # The directories for files considered "installed with the interpreter". self.pylib_dirs = set() if not self.config.cover_pylib: # Look at where some standard modules are located. That's the diff --git a/coverage/html.py b/coverage/html.py index 357de94c..3c5e3b46 100644 --- a/coverage/html.py +++ b/coverage/html.py @@ -58,7 +58,8 @@ def data(fname): class HtmlReporter(Reporter): """HTML reporting.""" - # These files will be copied from the htmlfiles dir to the output dir. + # These files will be copied from the htmlfiles directory to the output + # directory. STATIC_FILES = [ ("style.css", ""), ("jquery.min.js", "jquery"), diff --git a/coverage/misc.py b/coverage/misc.py index 97d1f726..50396d61 100644 --- a/coverage/misc.py +++ b/coverage/misc.py @@ -91,7 +91,7 @@ def expensive(fn): attr = "_cache_" + fn.__name__ def _wrapped(self): - """Inner fn that checks the cache.""" + """Inner function that checks the cache.""" if not hasattr(self, attr): setattr(self, attr, fn(self)) return getattr(self, attr) diff --git a/coverage/parser.py b/coverage/parser.py index a2b1b610..2bdd1bc9 100644 --- a/coverage/parser.py +++ b/coverage/parser.py @@ -274,7 +274,7 @@ class PythonParser(CodeParser): # Class definitions have one extra exit, so remove one for each: for l in self.classdefs: - # Ensure key is there: classdefs can include excluded lines. + # Ensure key is there: class definitions can include excluded lines. if l in exit_counts: exit_counts[l] -= 1 diff --git a/coverage/test_helpers.py b/coverage/test_helpers.py index 3ddb48ba..f36be70b 100644 --- a/coverage/test_helpers.py +++ b/coverage/test_helpers.py @@ -145,7 +145,7 @@ class TempDirMixin(SysPathAwareMixin, ModuleAwareMixin, TestCase): """A test case mixin that creates a temp directory and files in it. Includes SysPathAwareMixin and ModuleAwareMixin, because making and using - temp dirs like this will also need that kind of isolation. + temp directories like this will also need that kind of isolation. """ @@ -238,7 +238,7 @@ class TempDirMixin(SysPathAwareMixin, ModuleAwareMixin, TestCase): # We run some tests in temporary directories, because they may need to make # files for the tests. But this is expensive, so we can change per-class - # whether a temp dir is used or not. It's easy to forget to set that + # whether a temp directory is used or not. It's easy to forget to set that # option properly, so we track information about what the tests did, and # then report at the end of the process on test classes that were set # wrong. diff --git a/doc/dict.txt b/doc/dict.txt index e2fec782..46f08c12 100644 --- a/doc/dict.txt +++ b/doc/dict.txt @@ -21,6 +21,7 @@ bytestring canonicalize canonicalized canonicalizes +chdir'd cmdline Cobertura codecs @@ -53,6 +54,8 @@ endfor endif eventlet exe +exec'd +exec'ing execfile executable's expr @@ -61,6 +64,7 @@ filenames filepath fname fnmatch +fooey fpath fullcoverage getattr @@ -89,6 +93,8 @@ kwargs matcher matchers merchantability +metadata +meth mixin modulename monkeypatch @@ -136,6 +142,7 @@ pythonpath PYTHONPATH pyw rcfile +readme regex regexes renderer @@ -179,6 +186,7 @@ untokenizable URL UTF utf +versionadded virtualenv whitespace wikipedia @@ -13,7 +13,7 @@ Coverage.py runs on CPython 2.6, 2.7, 3.3, 3.4 or 3.5, PyPy 2.4, and PyPy3 2.4. Documentation is on `Read the Docs <{docurl}>`_. Code repository and issue tracker are on `Bitbucket <http://bitbucket.org/ned/coveragepy>`_, with a -mirrored repo on `GitHub <https://github.com/nedbat/coveragepy>`_. +mirrored repository on `GitHub <https://github.com/nedbat/coveragepy>`_. New in 4.0 beta: ``--concurrency``, dropped support for older Pythons, setup.cfg support, plugins for other file variants, supported data API, @@ -88,7 +88,7 @@ setup_args = dict( entry_points = {'console_scripts': scripts}, - # We need to get HTML assets from our htmlfiles dir. + # We need to get HTML assets from our htmlfiles directory. zip_safe = False, author = 'Ned Batchelder and others', diff --git a/tests/test_coverage.py b/tests/test_coverage.py index e2f0a614..9e2a444c 100644 --- a/tests/test_coverage.py +++ b/tests/test_coverage.py @@ -1675,18 +1675,20 @@ class ModuleTest(CoverageTest): class ReportingTest(CoverageTest): """Tests of some reporting behavior.""" - # We don't make any temp files, but we need an empty directory to run the - # tests in. + # We don't make any temporary files, but we need an empty directory to run + # the tests in. no_files_in_temp_dir = True def test_no_data_to_report_on_annotate(self): - # Reporting with no data produces a nice message and no output dir. + # Reporting with no data produces a nice message and no output + # directory. with self.assertRaisesRegex(CoverageException, "No data to report."): self.command_line("annotate -d ann") self.assert_doesnt_exist("ann") def test_no_data_to_report_on_html(self): - # Reporting with no data produces a nice message and no output dir. + # Reporting with no data produces a nice message and no output + # directory. with self.assertRaisesRegex(CoverageException, "No data to report."): self.command_line("html -d htmlcov") self.assert_doesnt_exist("htmlcov") diff --git a/tests/test_data.py b/tests/test_data.py index b370aa21..3c2b5728 100644 --- a/tests/test_data.py +++ b/tests/test_data.py @@ -349,7 +349,7 @@ class CoverageDataTest(DataTestHelpers, CoverageTest): class CoverageDataTestInTempDir(DataTestHelpers, CoverageTest): - """Tests of CoverageData that need a temp dir to make files.""" + """Tests of CoverageData that need a temporary directory to make files.""" def test_read_write_lines(self): covdata1 = CoverageData() diff --git a/tests/test_farm.py b/tests/test_farm.py index daa83d92..89e6225e 100644 --- a/tests/test_farm.py +++ b/tests/test_farm.py @@ -346,7 +346,7 @@ class FarmTestCase(object): def doesnt_contain(self, filename, *strlist): """Check that the file contains none of a list of strings. - An assert will be raised if any of the strings in strlist appears in + An assert will be raised if any of the strings in `strlist` appears in `filename`. """ |