Skip to content

Commit 7adcd4f

Browse files
1 parent e14c7dc commit 7adcd4f

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

docassemble/ALWeaver/generator_constants.py

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -288,30 +288,30 @@ class GeneratorConstantObject(object):
288288
]
289289

290290
generator_constants.DISPLAY_SUFFIX_TO_SETTABLE_SUFFIX = {
291-
"\.address.block\(\)$": ".address.address",
292-
"\.address.line_one\(\)$": ".address.address",
293-
"\.address.line_two\(\)$": ".address.address",
294-
"\.address.on_one_line\(\)$": ".address.address",
295-
"\.age_in_years\(\)$": ".birthdate",
296-
"\.birthdate.format\(.*\)$": ".birthdate",
297-
"\.familiar_or\(\)$": ".name.first",
298-
"\.familiar\(\)$": ".name.first",
299-
"\.formatted_age\(.*\)$": ".birthdate",
300-
"\.mailing_address.block\(\)$": ".mailing_address.address",
301-
"\.mailing_address.line_one\(\)$": ".mailing_address.address",
302-
"\.mailing_address.line_two\(\)$": ".mailing_address.address",
303-
"\.mailing_address.on_one_line\(\)$": ".mailing_address.address",
304-
"\.name.middle_initial\(\)$": ".name.first",
305-
"\.phone_numbers\(\)$": ".phone_number",
306-
"\.preferred_name$": ".preferred_name.first",
291+
r"\.address.block\(\)$": ".address.address",
292+
r"\.address.line_one\(\)$": ".address.address",
293+
r"\.address.line_two\(\)$": ".address.address",
294+
r"\.address.on_one_line\(\)$": ".address.address",
295+
r"\.age_in_years\(\)$": ".birthdate",
296+
r"\.birthdate.format\(.*\)$": ".birthdate",
297+
r"\.familiar_or\(\)$": ".name.first",
298+
r"\.familiar\(\)$": ".name.first",
299+
r"\.formatted_age\(.*\)$": ".birthdate",
300+
r"\.mailing_address.block\(\)$": ".mailing_address.address",
301+
r"\.mailing_address.line_one\(\)$": ".mailing_address.address",
302+
r"\.mailing_address.line_two\(\)$": ".mailing_address.address",
303+
r"\.mailing_address.on_one_line\(\)$": ".mailing_address.address",
304+
r"\.name.middle_initial\(\)$": ".name.first",
305+
r"\.phone_numbers\(\)$": ".phone_number",
306+
r"\.preferred_name$": ".preferred_name.first",
307307
}
308308

309309
# Test needed: Jinja `{{ parents[0].name_of_dog }}` should remain the same,
310310
# not `.name.full()` in the review screen displayed value
311311
generator_constants.FULL_DISPLAY = {
312-
"\.name$": ".name.full()",
313-
"\.address$": ".address.block()",
314-
"\.mailing_address$": ".mailing_address.block()",
312+
r"\.name$": ".name.full()",
313+
r"\.address$": ".address.block()",
314+
r"\.mailing_address$": ".mailing_address.block()",
315315
}
316316

317317
# Possible values for 'Allowed Courts', when looking up courts to submit to

docassemble/ALWeaver/interview_generator.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ def trigger_gather(
566566
return self.final_display_var
567567
if self.final_display_var.endswith("previous_names"):
568568
return self.final_display_var + GATHER_CALL
569-
if re.search("previous_names\[\d\]$", self.final_display_var):
569+
if re.search(r"previous_names\[\d\]$", self.final_display_var):
570570
return self.final_display_var[: -len("[0]")] + GATHER_CALL
571571
# NOTE: this only works through previous_names[9]
572572

@@ -1068,7 +1068,7 @@ def get_person_candidates(
10681068
# This will be reached only for a DOCX and we decided to make
10691069
# custom people all be plural. So we ALWAYS strip off the leading
10701070
# index, like [0].name.first
1071-
possible_suffix = re.sub("^\[\d+\]", "", matches.groups()[1])
1071+
possible_suffix = re.sub(r"^\[\d+\]", "", matches.groups()[1])
10721072
# Look for suffixes normally associated with people like .name.first for a DOCX
10731073
if possible_suffix in people_suffixes:
10741074
people.add(matches.groups()[0])
@@ -1499,7 +1499,7 @@ def package_info(self) -> Dict[str, Any]:
14991499

15001500
@property
15011501
def package_title(self):
1502-
return re.sub("\W|_", "", self.interview_label.title())
1502+
return re.sub(r"\W|_", "", self.interview_label.title())
15031503

15041504
def create_package(
15051505
self,
@@ -2495,7 +2495,7 @@ def get_reserved_label_parts(prefixes: list, label: str):
24952495
Return an re.matches object for all matching variable names,
24962496
like user1_something, etc.
24972497
"""
2498-
return re.search(r"^(" + "|".join(prefixes) + ")(\d*)(.*)", label)
2498+
return re.search(r"^(" + "|".join(prefixes) + r")(\d*)(.*)", label)
24992499

25002500

25012501
def using_string(params: dict, elements_as_variable_list: bool = False) -> str:
@@ -2578,7 +2578,7 @@ def bad_name_reason(field: DAField) -> Optional[str]:
25782578
if len(field.raw_field_names) > 0:
25792579
start += (
25802580
comma_and_list(
2581-
[n.replace("`", "\`") for n in field.raw_field_names]
2581+
[n.replace("`", r"\`") for n in field.raw_field_names]
25822582
)
25832583
+ ". "
25842584
)

0 commit comments

Comments
 (0)