- syntaxtree.flatten_xml: now compatible with 're', not just 'regex'

- test/run.py works now without nose being installed

DHParser/syntaxtree.py

@@ -191,10 +191,14 @@ def flatten_sxpr(sxpr: str) -> str:
 
 
 def flatten_xml(xml: str) -> str:
-    """Returns an XML-tree as a one linter without unnecessary whitespace,
+    """Returns an XML-tree as a one liner without unnecessary whitespace,
     i.e. only whitespace within leaf-nodes is preserved.
     """
-    return re.sub(r'\s+(?=<\w)', '', re.sub(r'(?<=</\w+>)\s+', '', xml))
+    # works only with regex
+    # return re.sub(r'\s+(?=<\w)', '', re.sub(r'(?<=</\w+>)\s+', '', xml))
+    def tag_only(m):
+        return m.groupdict()['closing_tag']
+    return re.sub(r'\s+(?=<\w)', '', re.sub(r'(?P<closing_tag></\w+>)\s+', tag_only, xml))
 
 
 class Node(collections.abc.Sized):

test/run.py

@@ -3,7 +3,19 @@
 if __name__ == "__main__":
     import os
 
-    if os.getcwd().endswith('test'):
-        os.chdir('..')
-    print("Running nosetests:")
-    os.system("nosetests test")
+    # if os.getcwd().endswith('test'):
+    #     os.chdir('..')
+    # print("Running nosetests:")
+    # os.system("nosetests test")
+
+    interpreter = 'python '
+    # interpreter = r'C:\Users\di68kap\AppData\Local\Programs\Python\Python37-32\python.exe '
+
+    os.system(interpreter + '--version')
+
+    assert os.getcwd().endswith('test')
+    files = os.listdir()
+    for filename in files:
+        if filename.startswith('test_'):
+            print('\nTEST ' + filename)
+            os.system(interpreter + filename)

test/test_ebnf.py

@@ -451,4 +451,4 @@ class TestAllSome:
 if __name__ == "__main__":
     from DHParser.testing import runner
 
-    runner("TestTermBug", globals())
+    runner("", globals())

test/test_syntaxtree.py

@@ -59,6 +59,11 @@ class TestParseXML:
         tree = parse_xml(' <a>   <b>beta</b>   </a> ')
         assert flatten_xml(tree.as_xml()) == '<a><b>beta</b></a>'
 
+    def test_flatten_xml(self):
+        tree = parse_xml('<alpha>\n  <beta>gamma</beta>\n</alpha>')
+        flat_xml = flatten_xml(tree.as_xml())
+        assert flat_xml == '<alpha><beta>gamma</beta></alpha>', flat_xml
+
 
 class TestNode:
     """