Moved to existing check

2 files changed, 11 insertions, 33 deletions

diff --git a/pycodestyle.py b/pycodestyle.py
index abadf6e..47ab5ce 100755
--- a/pycodestyle.py
+++ b/pycodestyle.py
@@ -494,6 +494,17 @@ def whitespace_around_keywords(logical_line):
         elif len(after) > 1:
             yield match.start(2), "E271 multiple spaces after keyword"
 
+    if sys.version_info >= (3, 10):
+        match = MATCH_CASE_REGEX.match(logical_line)
+        if match:
+            whitespace = match.groups()[0]
+            if whitespace == ' ':
+                return
+            if whitespace == '':
+                yield match.start(1), "E275 missing whitespace after keyword"
+            else:
+                yield match.start(1), "E271 multiple spaces after keyword"
+
 
 @register_check
 def missing_whitespace_after_import_keyword(logical_line):
@@ -514,32 +525,6 @@ def missing_whitespace_after_import_keyword(logical_line):
 
 
 @register_check
-def missing_whitespace_after_match_case(logical_line):
-    r"""Check whitespace after 'match' and 'case'.
-
-    Python 3.10
-    Okay: match status:
-    E271: match  status:
-    E271: case\tstatus:
-    E271: case   _:
-    E275: matchstatus:
-    E275: casestatus:
-    E275: case_:
-    """
-    if sys.version_info < (3, 10):
-        return
-    match = MATCH_CASE_REGEX.match(logical_line)
-    if match:
-        whitespace = match.groups()[0]
-        if whitespace == ' ':
-            return
-        if whitespace == '':
-            yield match.start(1), "E275 missing whitespace after keyword"
-        else:
-            yield match.start(1), "E271 multiple spaces after keyword"
-
-
-@register_check
 def missing_whitespace(logical_line):
     r"""Each comma, semicolon or colon should be followed by whitespace.
 
diff --git a/testsuite/support.py b/testsuite/support.py
index e6c897f..eb8b443 100644
--- a/testsuite/support.py
+++ b/testsuite/support.py
@@ -6,7 +6,6 @@ import sys
 from pycodestyle import Checker, BaseReport, StandardReport, readlines
 
 SELFTEST_REGEX = re.compile(r'\b(Okay|[EW]\d{3}):\s(.*)')
-SELFTEST_PY_REGEX = re.compile(r'\bPython (\d).(\d+)')
 ROOT_DIR = os.path.dirname(os.path.dirname(__file__))
 
 
@@ -113,14 +112,8 @@ def selftest(options):
     counters = report.counters
     checks = options.physical_checks + options.logical_checks
     for name, check, argument_names in checks:
-        python_version = None
         for line in check.__doc__.splitlines():
             line = line.lstrip()
-            match = SELFTEST_PY_REGEX.match(line)
-            if match:
-                python_version = tuple(map(int, match.groups()))
-            if python_version and sys.version_info < python_version:
-                continue
             match = SELFTEST_REGEX.match(line)
             if match is None:
                 continue