Skip to content

Commit f6eb8a8

Browse files
authored
Merge pull request #100 from aphedges/fix-invalid-escapes
Fix `SyntaxError: invalid escape sequence` exceptions
2 parents f84f727 + c725e6a commit f6eb8a8

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

.github/workflows/test-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ jobs:
4343
pip install -e .[dev]
4444
- name: Test
4545
run: |
46-
pytest
46+
python -X dev -bb -m pytest

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ addopts =
5959
--cov-report html
6060
timeout = 10
6161
filterwarnings =
62-
ignore::DeprecationWarning
62+
error
6363

6464
[pylint.MESSAGES CONTROL]
6565
extension-pkg-whitelist =

src/daidepp/grammar/grammar.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@
4343
"prov_landlock": '"BOH" / "BUD" / "BUR" / "MOS" / "MUN" / "GAL" / "PAR" / "RUH" / "SER" / "SIL" / "TYR" / "UKR" / "VIE" / "WAR" ',
4444
"prov_sea": '"ADR" / "AEG" / "BAL" / "BAR" / "BLA" / "GOB" / "EAS" / "ECH" / "HEL" / "ION" / "IRI" / "GOL" / "MAO" / "NAO" / "NTH" / "NWG" / "SKA" / "TYS" / "WES"',
4545
"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"',
46-
"turn": 'season ws ~"\d{4}"',
46+
"turn": r'season ws ~r"\d{4}"',
4747
"season": '"SPR" / "SUM" / "FAL" / "AUT" / "WIN"',
48-
"lpar": '~"\s*\(\s*"',
49-
"rpar": '~"\s*\)\s*"',
50-
"ws": '~"\s+"',
48+
"lpar": r'~r"\s*\(\s*"',
49+
"rpar": r'~r"\s*\)\s*"',
50+
"ws": r'~r"\s+"',
5151
}
5252

5353
# Peace and Alliances
@@ -102,7 +102,7 @@
102102

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

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

0 commit comments

Comments
 (0)