Fix regex for bare # pragma: no cover

Author: domdfcoding

coverage_pyver_pragma/__init__.py

@@ -153,21 +153,24 @@ def configure(self, config: Any) -> None:
 		# print(config.exclude_list)
 
 		# Reinstate the general regex, but making sure it isn't followed by a left bracket.
-		config.exclude_list.append(
-				make_not_exclude_regex(platform.system(), platform.python_implementation()).pattern
-				)
+		config.exclude_list += [
+				p.pattern for p in make_not_exclude_regexs(platform.system(), platform.python_implementation())
+				]
 
 		# TODO: Python 4.X
 
 
-def make_not_exclude_regex(
+def make_not_exclude_regexs(
 		current_platform: str,
 		current_implementation: str,
-		) -> Pattern:
+		) -> List[Pattern]:
 
-	return re.compile(
-			fr"{regex_main} (?!\(.*(.{{0,2}}(py|PY|Py)3\d(\+)?|!{current_platform}|!{current_implementation}).*\)).*$"
-			)
+	return [
+			re.compile(
+					fr"{regex_main} (?!\(.*(.{{0,2}}(py|PY|Py)3\d(\+)?|!{current_platform}|!{current_implementation}).*\)).*$"
+					),
+			re.compile(fr"{regex_main}$"),
+			]
 
 
 def coverage_init(reg, options):

tests/test_plugin.py

@@ -3,7 +3,7 @@
 import sys
 
 # this package
-from coverage_pyver_pragma import PyVerPragmaPlugin, make_not_exclude_regex, make_regexes, regex_main
+from coverage_pyver_pragma import PyVerPragmaPlugin, make_not_exclude_regexs, make_regexes, regex_main
 
 
 class MockConfig:
@@ -18,4 +18,4 @@ def test_plugin():
 
 	assert mock_config.exclude_list == [
 			p.pattern for p in make_regexes(sys.version_info, platform.system(), platform.python_implementation())
-			] + [make_not_exclude_regex(platform.system(), platform.python_implementation()).pattern]
+			] + [p.pattern for p in make_not_exclude_regexs(platform.system(), platform.python_implementation())]

tests/test_regex.py

@@ -7,12 +7,12 @@
 import pytest
 
 # this package
-from coverage_pyver_pragma import make_not_exclude_regex, make_regexes
+from coverage_pyver_pragma import make_not_exclude_regexs, make_regexes
 
 
 def test_not_version_regex():
 
-	not_version_regex = make_not_exclude_regex("Linux", "CPython").pattern
+	not_version_regex = make_not_exclude_regexs("Linux", "CPython")[0].pattern
 	print(not_version_regex)
 
 	counter = 1
@@ -37,7 +37,6 @@ def test_not_version_regex():
 													raise AssertionError(f"[{counter} FAIL: {test_string}]")
 												counter += 1
 
-	# TODO Regex for # pragma: no cover etc with nothing after it
 	for comment_string in ['#', "# ", "#  ", "#\t", "# \t", "# \t ", "#\t "]:
 		for pragma_string in ["pragma", "PRAGMA"]:
 			for post_pragma_space in ['', ':', ": ", ":\t", "  "]:
@@ -46,7 +45,25 @@ def test_not_version_regex():
 						for cover_string in ["cover", "COVER"]:
 							for post_cover_space in [' ']:
 								# ['', ' ', "\t", "  "]:  # TODO: This regex is picky about the space here
-								for post_cover_text in ['', "abcdefg", "hello world"]:
+								for post_cover_text in ["abcdefg", "hello world"]:
+									test_string = f"{comment_string}{pragma_string}{post_pragma_space}{no_string}{post_no_space}{cover_string}{post_cover_space}{post_cover_text}"
+									# print(f"[{counter} TESTING: {test_string}]")
+
+									if re.match(not_version_regex, test_string) is None:
+										raise AssertionError(f"[{counter} FAIL: {test_string}]")
+									counter += 1
+
+	not_version_regex = make_not_exclude_regexs("Linux", "CPython")[1].pattern
+	print(not_version_regex)
+
+	for comment_string in ['#', "# ", "#  ", "#\t", "# \t", "# \t ", "#\t "]:
+		for pragma_string in ["pragma", "PRAGMA"]:
+			for post_pragma_space in ['', ':', ": ", ":\t", "  "]:
+				for no_string in ["no", "NO"]:
+					for post_no_space in ['', ' ', "\t", "  "]:
+						for cover_string in ["cover", "COVER"]:
+							for post_cover_space in ['']:
+								for post_cover_text in ['']:
 									test_string = f"{comment_string}{pragma_string}{post_pragma_space}{no_string}{post_no_space}{cover_string}{post_cover_space}{post_cover_text}"
 									# print(f"[{counter} TESTING: {test_string}]")