markers: support new ident '|'

pytest-dev · Apr 30, 2024 · 16d317f · 16d317f
1 parent feaae2f
commit 16d317f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -156,6 +156,7 @@ Florian Bruhin
 Florian Dahlitz
 Floris Bruynooghe
 Fraser Stark
+Fu Hanxi
 Gabriel Landau
 Gabriel Reis
 Garvit Shubham

diff --git a/changelog/12277.improvement.rst b/changelog/12277.improvement.rst
@@ -0,0 +1 @@
+Supported vertical bar ``|`` inside a marker.
diff --git a/src/_pytest/mark/expression.py b/src/_pytest/mark/expression.py
@@ -6,7 +6,7 @@
 expr:       and_expr ('or' and_expr)*
 and_expr:   not_expr ('and' not_expr)*
 not_expr:   'not' not_expr | '(' expr ')' | ident
-ident:      (\w|:|\+|-|\.|\[|\]|\\|/)+
+ident:      (\w|:|\+|-|\.|\[|\]|\\|/|\|)+
 
 The semantics are:
 
@@ -86,7 +86,7 @@ def lex(self, input: str) -> Iterator[Token]:
                 yield Token(TokenType.RPAREN, ")", pos)
                 pos += 1
             else:
-                match = re.match(r"(:?\w|:|\+|-|\.|\[|\]|\\|/)+", input[pos:])
+                match = re.match(r"(:?\w|:|\+|-|\.|\[|\]|\\|/|\|)+", input[pos:])
                 if match:
                     value = match.group(0)
                     if value == "or":