Move gpo_cfr/interpretations into the interpparser

Also rewrites the associated test file to use py.test style

interpparser/amendments.py

@@ -3,9 +3,9 @@
 
 from lxml import etree
 
+from interpparser import gpo_cfr
 from regparser.notice.amendments.utils import label_amdpar_from
 from regparser.notice.util import spaces_then_remove
-from regparser.tree.gpo_cfr import interpretations
 from regparser.tree.struct import Node
 
 
@@ -53,7 +53,7 @@ def contains_supp(n):
                 seen_header = True
 
     root = Node(label=[cfr_part, Node.INTERP_MARK], node_type=Node.INTERP)
-    root = interpretations.parse_from_xml(root, xml_nodes)
+    root = gpo_cfr.parse_from_xml(root, xml_nodes)
     if not root.children:
         return None
     else:

interpparser/preprocessors.py

@@ -1,4 +1,4 @@
-from regparser.tree.gpo_cfr.interpretations import get_app_title
+from interpparser.gpo_cfr import get_app_title
 
 _CONTAINS_SUPPLEMENT = "contains(., 'Supplement I')"
 _SUPPLEMENT_HD = "//REGTEXT//HD[@SOURCE='HD1' and {0}]".format(

interpparser/setup.py

@@ -19,5 +19,8 @@
             ('appendix-to-interp = interpparser.preprocessors:'
              'appendix_to_interp'),
             ],
+        "eregs_ns.parser.xml_matchers.gpo_cfr.PART": [
+            "interpretations = interpparser.gpo_cfr:parse_interp",
+            ]
     }
 )

setup.py

@@ -95,7 +95,6 @@
             "subpart = regparser.tree.gpo_cfr.subpart:parse_subpart",
             "subjgrp = regparser.tree.gpo_cfr.subpart:ParseSubjectGroup",
             "appendix = regparser.tree.gpo_cfr.appendices:parse_appendix",
-            "interp = regparser.tree.gpo_cfr.interpretations:parse_interp",
         ]
     }
 )

tests/interpparser/amendments_tests.py

@@ -11,7 +11,7 @@
 
 def test_parse_interp(monkeypatch):
     interp_lib = Mock()
-    monkeypatch.setattr(amendments, 'interpretations', interp_lib)
+    monkeypatch.setattr(amendments, 'gpo_cfr', interp_lib)
     xmls = []
     with XMLBuilder("REGTEXT") as ctx:
         with ctx.EXTRACT():