Another batch of 18f PRs

regparser/grammar/unified.py

@@ -112,6 +112,7 @@ def appendix_section(match):
     atomic.subpart_marker.copy().setParseAction(keep_pos).setResultsName(
         "marker")
     + atomic.subpart)
+
 marker_subpart_title = (
     atomic.subpart_marker.copy().setParseAction(keep_pos).setResultsName(
         "marker")

regparser/tree/xml_parser/reg_text.py

@@ -332,8 +332,11 @@ def build_from_section(reg_part, section_xml):
 
     nodes = []
     section_nums = []
-    for match in re.finditer(r'%s\.(\d+)' % reg_part, section_no):
-        section_nums.append(int(match.group(1)))
+    for match in re.finditer(r'%s\.(\d+[a-z]*)' % reg_part, section_no):
+        secnum_candidate = match.group(1)
+        if secnum_candidate.isdigit():
+            secnum_candidate = int(secnum_candidate)
+        section_nums.append(secnum_candidate)
 
     #  Span of section numbers
     if u'§§' == section_no[:2] and '-' in section_no:

requirements_test.txt

@@ -1,5 +1,6 @@
 cov-core==1.7
 coverage==3.6
+datatree==0.1.8.1
 flake8==2.4.0
 mock==1.0.1
 nose==1.2.1

tests/grammar_unified_tests.py

@@ -39,3 +39,16 @@ def test_marker_comment(self):
             result = unified.marker_comment.parseString(t)
             self.assertEqual("3", result.section)
             self.assertEqual("4", result.c1)
+
+    def test_marker_subpart_title(self):
+        # Typical case:
+        text = u'Subpart K\u2014Exportation'
+        result = unified.marker_subpart_title.parseString(text)
+        self.assertEqual(u'Exportation', result.subpart_title)
+        self.assertEqual(u'K', result.subpart)
+
+        # Reserved subpart:
+        text = u'Subpart J [Reserved]'
+        result = unified.marker_subpart_title.parseString(text)
+        self.assertEqual(u'[Reserved]', result.subpart_title)
+        self.assertEqual(u'J', result.subpart)