Skip to content

Fix SyntaxError: invalid escape sequence exceptions #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aphedges merged 3 commits into from
Jul 28, 2025
Merged

Fix SyntaxError: invalid escape sequence exceptions #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94a19dd
Fix `SyntaxError: invalid escape sequence` exceptions
aphedges Jul 15, 2025
483f95e
Error on all warnings during tests
aphedges Jul 15, 2025
c725e6a
Run `pytest` under stricter conditions
aphedges Jul 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ jobs:
pip install -e .[dev]
- name: Test
run: |
pytest
python -X dev -bb -m pytest
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ addopts =
--cov-report html
timeout = 10
filterwarnings =
ignore::DeprecationWarning
error

[pylint.MESSAGES CONTROL]
extension-pkg-whitelist =
Expand Down
12 changes: 6 additions & 6 deletions src/daidepp/grammar/grammar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@
"prov_landlock": '"BOH" / "BUD" / "BUR" / "MOS" / "MUN" / "GAL" / "PAR" / "RUH" / "SER" / "SIL" / "TYR" / "UKR" / "VIE" / "WAR" ',
"prov_sea": '"ADR" / "AEG" / "BAL" / "BAR" / "BLA" / "GOB" / "EAS" / "ECH" / "HEL" / "ION" / "IRI" / "GOL" / "MAO" / "NAO" / "NTH" / "NWG" / "SKA" / "TYS" / "WES"',
"supply_center": '"ANK" / "BEL" / "BER" / "BRE" / "BUD" / "BUL" / "CON" / "DEN" / "EDI" / "GRE" / "HOL" / "KIE" / "LON" / "LVP" / "MAR" / "MOS" / "MUN" / "NAP" / "NWY" / "PAR" / "POR" / "ROM" / "RUM" / "SER" / "SEV" / "SMY" / "SPA" / "STP" / "SWE" / "TRI" / "TUN" / "VEN" / "VIE" / "WAR"',
"turn": 'season ws ~"\d{4}"',
"turn": r'season ws ~r"\d{4}"',
"season": '"SPR" / "SUM" / "FAL" / "AUT" / "WIN"',
"lpar": '~"\s*\(\s*"',
"rpar": '~"\s*\)\s*"',
"ws": '~"\s+"',
"lpar": r'~r"\s*\(\s*"',
"rpar": r'~r"\s*\)\s*"',
"ws": r'~r"\s+"',
}

# Peace and Alliances
Expand Down Expand Up @@ -102,7 +102,7 @@

# Nested Multipart Arrangements
LEVEL_50: GrammarDict = {
"cho": '"CHO" lpar (~"\d+ \d+") rpar (lpar arrangement rpar)+',
"cho": r'"CHO" lpar (~r"\d+ \d+") rpar (lpar arrangement rpar)+',
"sub_arrangement": f"{TRAIL_TOKEN}and / orr / cho",
"arrangement": f"{TRAIL_TOKEN}cho",
"try_tokens": f'{TRAIL_TOKEN}"CHO"', # This isn't included in the original daide spec but I think they just forgot it.
Expand Down Expand Up @@ -204,7 +204,7 @@

# Utilities
LEVEL_160: GrammarDict = {
"float": 'ws*~"[-+]?((\d*\.\d+)|(\d+\.?))([Ee][+-]?\d+)?"',
"float": r'ws*~r"[-+]?((\d*\.\d+)|(\d+\.?))([Ee][+-]?\d+)?"',
"ulb": '"ULB" lpar power float rpar',
"uub": '"UUB" lpar power float rpar',
"sub_arrangement": f"{TRAIL_TOKEN}ulb / uub",
Expand Down