2 files changed, 20 insertions, 5 deletions
diff --git a/scripts/pnodes.py b/scripts/pnodes.py
index 99fc14809..6d38f63ae 100755
--- a/scripts/pnodes.py
+++ b/scripts/pnodes.py
@@ -2,7 +2,7 @@
 
 import re
 import sys
-import argparse
+from argparse import ArgumentParser
 
 field_file = "nodes.ads"
 kind_file = "iirs.ads"
@@ -883,8 +883,9 @@ actions = {
 }
 
 
-def main():
-    parser = argparse.ArgumentParser(description="Meta-grammar processor")
+def _generateCLIParser() -> ArgumentParser:
+    """"""
+    parser = ArgumentParser(description="Meta-grammar processor")
     parser.add_argument("action", choices=list(actions.keys()), default="disp-nodes")
     parser.add_argument(
         "--field-file",
@@ -941,6 +942,12 @@ def main():
         help="keep field order of nodes",
     )
     parser.set_defaults(flag_keep_order=False)
+
+    return parser
+
+
+def main():
+    parser = _generateCLIParser()
     args = parser.parse_args()
 
     # At some point, it would be simpler to create a class...
diff --git a/scripts/pnodespy.py b/scripts/pnodespy.py
index 2e3d72e6a..7713bb1d6 100755
--- a/scripts/pnodespy.py
+++ b/scripts/pnodespy.py
@@ -4,11 +4,15 @@
 
 from __future__ import print_function
 
+import re
 import sys
 from textwrap import dedent
 
-import pnodes
-import re
+try:
+  import scripts.pnodes as pnodes
+except:
+  import pnodes
+
 
 libname = "libghdl"
 
@@ -274,4 +278,8 @@ pnodes.actions.update(
 )
 
 
+def _generateCLIParser():
+    return pnodes._generateCLIParser()
+
+
 pnodes.main()