Merge branch 'release/1.8.2'

ctsit · Apr 26, 2022 · bef6e4f · bef6e4f
2 parents e720ccd + 060e11f
commit bef6e4f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,15 @@
 Changelog
 =========
+## [1.8.2] - 2022-04-26
+
+### Summary
+This release fixes another bug in the FTLD blanking logic parsing that caused
+an error for rules that contained both a multi-part question and a comma
+(i.e. "Question 3b,").
+
+### Updated
+ * Fix regular expression parsing for blanking rules in FTLD module to account for unusual punctuation in DED
+
 ## [1.8.1] - 2021-11-04
 ### Summary
 This release provides one major bug fix in the FTLD follow-up packet, updated

diff --git a/nacc/ftld/blanks.py b/nacc/ftld/blanks.py
@@ -82,10 +82,10 @@ def convert_rule_to_python(name: str, rule: str) -> bool:
     }
 
     single_value = re.compile(
-        r"Blank if( Question(s?))? *\w+ (?P<key>\w+)"
+        r"Blank if( Question(s?))? *\w+(,?) (?P<key>\w+)(,?)"
         r" *(?P<eq>=|ne) (?P<value>\d+)([^-]|$)")
     range_values = re.compile(
-        r"Blank if( Question(s?))? *\w+ (?P<key>\w+)"
+        r"Blank if( Question(s?))? *\w+(,?) (?P<key>\w+)(,?)"
         r" *(?P<eq>=|ne) (?P<start>\d+)-(?P<stop>\d+)( |$)")
     blank_value = re.compile(
         r"Blank if( Question(s?))? *\w+ (?P<key>\w+) *(?P<eq>=|ne) blank")

diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 
 from setuptools import setup, find_packages
 
-VERSION = "1.8.1"
+VERSION = "1.8.2"
 
 setup(
     name="nacculator",