Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
38 changes: 19 additions & 19 deletions docassemble/ALWeaver/generator_constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -288,30 +288,30 @@ class GeneratorConstantObject(object):
]

generator_constants.DISPLAY_SUFFIX_TO_SETTABLE_SUFFIX = {
"\.address.block\(\)$": ".address.address",
"\.address.line_one\(\)$": ".address.address",
"\.address.line_two\(\)$": ".address.address",
"\.address.on_one_line\(\)$": ".address.address",
"\.age_in_years\(\)$": ".birthdate",
"\.birthdate.format\(.*\)$": ".birthdate",
"\.familiar_or\(\)$": ".name.first",
"\.familiar\(\)$": ".name.first",
"\.formatted_age\(.*\)$": ".birthdate",
"\.mailing_address.block\(\)$": ".mailing_address.address",
"\.mailing_address.line_one\(\)$": ".mailing_address.address",
"\.mailing_address.line_two\(\)$": ".mailing_address.address",
"\.mailing_address.on_one_line\(\)$": ".mailing_address.address",
"\.name.middle_initial\(\)$": ".name.first",
"\.phone_numbers\(\)$": ".phone_number",
"\.preferred_name$": ".preferred_name.first",
r"\.address.block\(\)$": ".address.address",
r"\.address.line_one\(\)$": ".address.address",
r"\.address.line_two\(\)$": ".address.address",
r"\.address.on_one_line\(\)$": ".address.address",
r"\.age_in_years\(\)$": ".birthdate",
r"\.birthdate.format\(.*\)$": ".birthdate",
r"\.familiar_or\(\)$": ".name.first",
r"\.familiar\(\)$": ".name.first",
r"\.formatted_age\(.*\)$": ".birthdate",
r"\.mailing_address.block\(\)$": ".mailing_address.address",
r"\.mailing_address.line_one\(\)$": ".mailing_address.address",
r"\.mailing_address.line_two\(\)$": ".mailing_address.address",
r"\.mailing_address.on_one_line\(\)$": ".mailing_address.address",
r"\.name.middle_initial\(\)$": ".name.first",
r"\.phone_numbers\(\)$": ".phone_number",
r"\.preferred_name$": ".preferred_name.first",
}

# Test needed: Jinja `{{ parents[0].name_of_dog }}` should remain the same,
# not `.name.full()` in the review screen displayed value
generator_constants.FULL_DISPLAY = {
"\.name$": ".name.full()",
"\.address$": ".address.block()",
"\.mailing_address$": ".mailing_address.block()",
r"\.name$": ".name.full()",
r"\.address$": ".address.block()",
r"\.mailing_address$": ".mailing_address.block()",
}

# Possible values for 'Allowed Courts', when looking up courts to submit to
Expand Down
10 changes: 5 additions & 5 deletions docassemble/ALWeaver/interview_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ def trigger_gather(
return self.final_display_var
if self.final_display_var.endswith("previous_names"):
return self.final_display_var + GATHER_CALL
if re.search("previous_names\[\d\]$", self.final_display_var):
if re.search(r"previous_names\[\d\]$", self.final_display_var):
return self.final_display_var[: -len("[0]")] + GATHER_CALL
# NOTE: this only works through previous_names[9]

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

@property
def package_title(self):
return re.sub("\W|_", "", self.interview_label.title())
return re.sub(r"\W|_", "", self.interview_label.title())

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


def using_string(params: dict, elements_as_variable_list: bool = False) -> str:
Expand Down Expand Up @@ -2578,7 +2578,7 @@ def bad_name_reason(field: DAField) -> Optional[str]:
if len(field.raw_field_names) > 0:
start += (
comma_and_list(
[n.replace("`", "\`") for n in field.raw_field_names]
[n.replace("`", r"\`") for n in field.raw_field_names]
)
+ ". "
)
Expand Down
Loading