OK, I should really stop fiddling with spell-check...

6 files changed, 42 insertions, 14 deletions

diff --git a/coverage/backward.py b/coverage/backward.py
index 3372a8b3..0a08c6d9 100644
--- a/coverage/backward.py
+++ b/coverage/backward.py
@@ -76,7 +76,7 @@ if sys.version_info >= (3, 0):
 
     def bytes_to_ints(bytes_value):
         """Turn a bytes object into a sequence of ints."""
-        # In Py3, iterating bytes gives ints.
+        # In Python 3, iterating bytes gives ints.
         return bytes_value
 
 else:
@@ -103,10 +103,10 @@ else:
 
 
 try:
-    # In Py 2.x, the builtins were in __builtin__
+    # In Python 2.x, the builtins were in __builtin__
     BUILTINS = sys.modules['__builtin__']
 except KeyError:
-    # In Py 3.x, they're in builtins
+    # In Python 3.x, they're in builtins
     BUILTINS = sys.modules['builtins']
 
 
diff --git a/coverage/collector.py b/coverage/collector.py
index 6ffdc7c4..39acd7bd 100644
--- a/coverage/collector.py
+++ b/coverage/collector.py
@@ -132,8 +132,8 @@ class Collector(object):
 
     def reset(self):
         """Clear collected data, and prepare to collect more."""
-        # A dictionary mapping filenames to dicts with linenumber keys,
-        # or mapping filenames to dicts with linenumber pairs as keys.
+        # A dictionary mapping filenames to dicts with line number keys,
+        # or mapping filenames to dicts with line number pairs as keys.
         self.data = {}
 
         self.plugin_data = {}
diff --git a/coverage/control.py b/coverage/control.py
index c59424df..78d3b0a7 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -695,7 +695,7 @@ class Coverage(object):
 
                 if self.omit_match and self.omit_match.match(py_file):
                     # Turns out this file was omitted, so don't pull it back
-                    # in as un-executed.
+                    # in as unexecuted.
                     continue
 
                 self.data.touch_file(py_file)
diff --git a/pylintrc b/pylintrc
index b923a0bc..6a1e555f 100644
--- a/pylintrc
+++ b/pylintrc
@@ -334,5 +334,31 @@ ignore-docstrings=yes
 #
 
 spelling-dict=en_US
-# pylint doesn't strip the words, so they have to all be jammed on one line in order to be recognized... :(
-spelling-ignore-words=activestate,API,args,argv,bitbucket,BOM,boolean,BTW,builtin,builtins,bytecode,bytecodes,canonicalize,canonicalized,canonicalizes,codecs,config,configparser,configurability,configurability's,cov,coveragerc,covhtml,css,dict,dict's,dicts,dirname,django,docstring,docstrings,doctest,DOM,encodings,endfor,endif,eventlet,expr,filename,filenames,fname,fnmatch,fpath,fullcoverage,getattr,gevent,gevent's,GitHub,globals,greenlet,HTML,http,importlib,instancemethod,int,ints,iterable,iterables,jython,kwargs,matcher,matchers,merchantability,mixin,modulename,morf,morfs,multi,multi-line,namespace,namespaces,nano,nbsp,ned,nedbatchelder,nullary,num,OK,opcode,opcodes,optparse,os,outfile,parsable,parsers,pragma,pre,programmability,py,py's,pyc,pypy,pyw,rcfile,regex,regexes,renderer,settrace,sitecustomize,stackoverflow,stderr,stdlib,stdout,str,sys,templite,TODO,tokenization,tokenize,tokenized,tokenizer,tokenizes,tokenizing,traceback,tuple,tuples,txt,unittest,URL,UTF,utf,virtualenv,whitespace,wikipedia,wildcard,wildcards,XML,xrange
+# pylint doesn't strip the words, so insert a dummy x at the beginning to make
+# the other words work properly.
+# https://bitbucket.org/logilab/pylint/issue/398/spelling-words-need-to-be-stripped-or-the
+spelling-ignore-words=
+    x,activestate,API,args,argv,
+    x,bitbucket,BOM,boolean,BTW,builtin,builtins,bytecode,bytecodes,
+    x,canonicalize,canonicalized,canonicalizes,cmdline,codecs,colorsys,config,configparser,
+    x,configurability,configurability's,cov,coveragepy,coveragerc,covhtml,css,
+    x,dict,dict's,dicts,dirname,django,docstring,docstrings,doctest,DOM,
+    x,encodings,endfor,endif,eventlet,exe,execfile,executable's,expr,
+    x,filename,filenames,fname,fnmatch,fpath,fullcoverage,
+    x,getattr,gevent,gevent's,github,globals,greenlet,
+    x,HTML,http,https,
+    x,importlib,instancemethod,int,ints,iterable,iterables,
+    x,jython,
+    x,kwargs,
+    x,matcher,matchers,merchantability,mixin,modulename,morf,morfs,multi,
+    x,namespace,namespaces,nano,nbsp,ned,nedbat,nedbatchelder,nosetests,nullary,num,
+    x,OK,opcode,opcodes,optparse,os,outfile,
+    x,parsable,parsers,pragma,pre,programmability,py,py's,pyc,pyexpat,pypy,PYTHONPATH,pyw,
+    x,rcfile,regex,regexes,renderer,
+    x,settrace,setuptools,sitecustomize,stackoverflow,stderr,stdlib,stdout,str,sys,
+    x,templite,timestamp,TODO,tokenization,tokenize,tokenized,tokenizer,tokenizes,
+    x,tokenizing,traceback,tuple,tuples,txt,
+    x,ubuntu,undecodable,unexecuted,unittest,unparsable,unsubscriptable,untokenizable,URL,UTF,utf,
+    x,virtualenv,
+    x,whitespace,wikipedia,wildcard,wildcards,
+    x,XML,xrange,
diff --git a/tests/test_config.py b/tests/test_config.py
index e0424923..ee4db966 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -91,7 +91,7 @@ class ConfigTest(CoverageTest):
         self.assertEqual(cov.config.data_file, "fromarg.dat")
 
     def test_parse_errors(self):
-        # Im-parseable values raise CoverageException, with details.
+        # Im-parsable values raise CoverageException, with details.
         bad_configs_and_msgs = [
             ("[run]\ntimid = maybe?\n", r"maybe[?]"),
             ("timid = 1\n", r"timid = 1"),
diff --git a/tests/test_process.py b/tests/test_process.py
index 2ed8c4ab..0409e4a1 100644
--- a/tests/test_process.py
+++ b/tests/test_process.py
@@ -752,12 +752,14 @@ class ProcessStartupTest(ProcessCoverageMixin, CoverageTest):
 class ProcessStartupWithSourceTest(ProcessCoverageMixin, CoverageTest):
     """Show that we can configure {[run]source} during process-level coverage.
 
-    There are three interesting variables:
-    1) -m versus a simple script argument (eg `python myscript`)
-    2) filtering for the top-level (main.py) or second-level (sub.py) module
-    3) whether the files are in a package or not
+    There are three interesting variables, for a total of eight tests:
 
-    ... for a total of eight tests.
+        1. -m versus a simple script argument (for example, `python myscript`),
+
+        2. filtering for the top-level (main.py) or second-level (sub.py)
+           module, and
+
+        3. whether the files are in a package or not.
 
     """