Fix pyexit merges

npf/section.py

@@ -1,6 +1,5 @@
 import ast
 
-import sre_constants
 from typing import List, Set
 from collections.abc import Mapping
 
@@ -102,7 +101,11 @@ def build(test, data):
             return s
 
         if sectionName.startswith('pyexit'):
-            name = matcher.group("PyExitName").strip()
+            pg = matcher.group("PyExitName")
+            if pg:
+                name = pg.strip()
+            else:
+                name = ""
             s = SectionPyExit(name)
             return s
 
@@ -244,8 +247,8 @@ def __init__(self, name = ""):
         self.index = ++self.num
         self.name = name
 
-    def finish(self, testie):
-        testie.pyexits.append(self)
+    def finish(self, test):
+        test.pyexits.append(self)
 
     def get_name(self, full=False):
         if self.name != "":
@@ -838,7 +841,7 @@ def match(self, key, val):
             for match in self.get_list(key):
                 if re.match(match, val):
                     return True
-        except sre_constants.error:
+        except Exception:
             print("ERROR : Regex %s does not work" % key)
         return False
 

npf/test.py

@@ -164,11 +164,12 @@ def __init__(self, test_path, options, tags=None, role=None, inline=None):
         self.imports = []
         self.requirements = []
         self.sendfile = {}
-        self.filename = os.path.basename(testie_path)
-        self.path = os.path.dirname(os.path.abspath(testie_path))
+        self.filename = os.path.basename(test_path)
+        self.path = os.path.dirname(os.path.abspath(test_path))
         self.options = options
         self.tags = tags if tags else []
         self.role = role
+        self.pyexits = []
 
         i = -1
         try: