diff options
author | Ned Batchelder <ned@nedbatchelder.com> | 2012-11-10 15:19:09 -0500 |
---|---|---|
committer | Ned Batchelder <ned@nedbatchelder.com> | 2012-11-10 15:19:09 -0500 |
commit | f52b43321aad4c8e50bafbfbe95f1e7e570b4b8d (patch) | |
tree | 78732b1d1d9a24a84b0424ad5cd355c05c6ca96b /coverage | |
parent | 5aa66708b1c35fc7ce6e234bfe7684325e327ce4 (diff) | |
download | python-coveragepy-git-f52b43321aad4c8e50bafbfbe95f1e7e570b4b8d.tar.gz |
Upgrading pylint means fixing more nits.
Diffstat (limited to 'coverage')
-rw-r--r-- | coverage/bytecode.py | 1 | ||||
-rw-r--r-- | coverage/cmdline.py | 4 | ||||
-rw-r--r-- | coverage/config.py | 6 | ||||
-rw-r--r-- | coverage/control.py | 2 | ||||
-rw-r--r-- | coverage/files.py | 2 | ||||
-rw-r--r-- | coverage/html.py | 2 | ||||
-rw-r--r-- | coverage/phystokens.py | 2 |
7 files changed, 10 insertions, 9 deletions
diff --git a/coverage/bytecode.py b/coverage/bytecode.py index 61c311eb..fd5c7da2 100644 --- a/coverage/bytecode.py +++ b/coverage/bytecode.py @@ -27,6 +27,7 @@ class ByteCodes(object): Returns `ByteCode` objects. """ + # pylint: disable=R0924 def __init__(self, code): self.code = code self.offset = 0 diff --git a/coverage/cmdline.py b/coverage/cmdline.py index 9e83e21b..f9b9b093 100644 --- a/coverage/cmdline.py +++ b/coverage/cmdline.py @@ -619,8 +619,8 @@ def unshell_list(s): HELP_TOPICS = { # ------------------------- -'classic': """\ -Coverage.py version %(__version__)s +'classic': +r"""Coverage.py version %(__version__)s Measure, collect, and report on code coverage in Python programs. Usage: diff --git a/coverage/config.py b/coverage/config.py index 7a6afe4d..7cac4ac0 100644 --- a/coverage/config.py +++ b/coverage/config.py @@ -15,10 +15,10 @@ class HandyConfigParser(configparser.ConfigParser): def read(self, filename): """Read a filename as UTF-8 configuration data.""" + kwargs = {} if sys.version_info >= (3, 2): - super().read(filename, encoding="utf-8") - else: - configparser.ConfigParser.read(self, filename) + kwargs['encoding'] = "utf-8" + configparser.ConfigParser.read(self, filename, **kwargs) def getlist(self, section, option): """Read a list of strings. diff --git a/coverage/control.py b/coverage/control.py index bda19a9b..9523defa 100644 --- a/coverage/control.py +++ b/coverage/control.py @@ -652,7 +652,7 @@ class coverage(object): ('path', sys.path), ('environment', [ ("%s = %s" % (k, v)) for k, v in os.environ.items() - if re.search("^COV|^PY", k) + if re.search(r"^COV|^PY", k) ]), ] return info diff --git a/coverage/files.py b/coverage/files.py index 632d6e31..84466504 100644 --- a/coverage/files.py +++ b/coverage/files.py @@ -196,7 +196,7 @@ class PathAliases(object): # either separator. regex_pat = regex_pat.replace(r"\/", r"[\\/]") # We want case-insensitive matching, so add that flag. - regex = re.compile("(?i)" + regex_pat) + regex = re.compile(r"(?i)" + regex_pat) # Normalize the result: it must end with a path separator. result_sep = sep(result) diff --git a/coverage/html.py b/coverage/html.py index fc1bee43..6a6c648e 100644 --- a/coverage/html.py +++ b/coverage/html.py @@ -366,5 +366,5 @@ def spaceless(html): Get rid of some. """ - html = re.sub(">\s+<p ", ">\n<p ", html) + html = re.sub(r">\s+<p ", ">\n<p ", html) return html diff --git a/coverage/phystokens.py b/coverage/phystokens.py index 3beebab1..166020e1 100644 --- a/coverage/phystokens.py +++ b/coverage/phystokens.py @@ -119,7 +119,7 @@ def source_encoding(source): # This is mostly code adapted from Py3.2's tokenize module. - cookie_re = re.compile("coding[:=]\s*([-\w.]+)") + cookie_re = re.compile(r"coding[:=]\s*([-\w.]+)") # Do this so the detect_encode code we copied will work. readline = iter(source.splitlines()).next |