Merge pull request #42 from dsummersl/issue-40

Support dashes in disposition method #40
deardurham · Jul 23, 2020 · 474384f · 474384f
2 parents a45b859 + 11c0e7e
commit 474384f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ciprs_reader/parser/section/offense.py b/ciprs_reader/parser/section/offense.py
@@ -85,7 +85,7 @@ def extract(self, matches, report):
 
 class OffenseDispositionMethod(OffenseSectionParser):
 
-    pattern = r"\s*Disposition Method:\s*(?P<value>[\w ]+)"
+    pattern = r"\s*Disposition Method:\s*(?P<value>[\w\- ]+)"
     section = ("Offense Record", "Disposition Method")
 
     def set_state(self, state):

diff --git a/tests/parsers/test_offense.py b/tests/parsers/test_offense.py
@@ -66,10 +66,10 @@ def test_offense_disposed_date(expected, val, report, state):
 
 
 def test_known_offense_disposition_method(report, state):
-    string = "    Disposition Method: DISPOSED BY JUDGE"
+    string = "    Disposition Method: WAIVER - MAGISTRATE"
     matches = offense.OffenseDispositionMethod(report, state).match(string)
     assert matches is not None, "Regex match failed"
-    assert matches["value"] == "DISPOSED BY JUDGE"
+    assert matches["value"] == "WAIVER - MAGISTRATE"
 
 
 def test_plea(report, state):