floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

markers: support new ident '|'

This commit is contained in:
Fu Hanxi 2024-04-30 13:11:34 +02:00
parent feaae2fb35
commit 16d317fed7
No known key found for this signature in database
GPG Key ID: 859132DBB182440F
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -156,6 +156,7 @@ Florian Bruhin
Florian Dahlitz Florian Dahlitz
Floris Bruynooghe Floris Bruynooghe
Fraser Stark Fraser Stark
Fu Hanxi
Gabriel Landau Gabriel Landau
Gabriel Reis Gabriel Reis
Garvit Shubham Garvit Shubham

1
changelog/12277.improvement.rst Normal file
View File

@ -0,0 +1 @@
Supported vertical bar ``|`` inside a marker.

4
src/_pytest/mark/expression.py
View File

@ -6,7 +6,7 @@ expression: expr? EOF
expr: and_expr ('or' and_expr)* expr: and_expr ('or' and_expr)*
and_expr: not_expr ('and' not_expr)* and_expr: not_expr ('and' not_expr)*
not_expr: 'not' not_expr | '(' expr ')' | ident not_expr: 'not' not_expr | '(' expr ')' | ident
ident: (\w|:|\+|-|\.|\[|\]|\\|/)+ ident: (\w|:|\+|-|\.|\[|\]|\\|/|\|)+
The semantics are: The semantics are:
@ -86,7 +86,7 @@ class Scanner:
yield Token(TokenType.RPAREN, ")", pos) yield Token(TokenType.RPAREN, ")", pos)
pos += 1 pos += 1
else: else:
match = re.match(r"(:?\w|:|\+|-|\.|\[|\]|\\|/)+", input[pos:]) match = re.match(r"(:?\w|:|\+|-|\.|\[|\]|\\|/|\|)+", input[pos:])
if match: if match:
value = match.group(0) value = match.group(0)
if value == "or": if value == "or":