Fixed #884 - tree module header not printed

pyang/plugins/tree.py

@@ -136,21 +136,23 @@ def print_help():
 """)
 
 def emit_tree(ctx, modules, fd, depth, llen, path):
-    printed_header = False
-
     def print_header(module):
-        nonlocal printed_header
         if not printed_header:
             bstr = ""
             b = module.search_one('belongs-to')
             if b is not None:
                 bstr = " (belongs-to %s)" % b.arg
             fd.write("%s: %s%s\n" % (module.keyword, module.arg, bstr))
-            printed_header = True
+            printed_header.append(None)
+
+    printed_header = []
 
     for module in modules:
         if printed_header:
             fd.write("\n")
+        del printed_header[:]
+
+
         chs = [ch for ch in module.i_children
                if ch.keyword in statements.data_definition_keywords]
         if path is not None and len(path) > 0:

test/test_issues/test_i884/Makefile

@@ -0,0 +1,2 @@
+test:
+	$(PYANG) -f tree a.yang b.yang | diff res.expect -

test/test_issues/test_i884/a.yang

@@ -0,0 +1,8 @@
+module a {
+  namespace urn:a;
+  prefix a;
+
+  leaf a {
+    type string;
+  }
+}

test/test_issues/test_i884/b.yang

@@ -0,0 +1,9 @@
+module b {
+  namespace urn:b;
+  prefix b;
+
+  leaf b {
+    type string;
+  }
+
+}

test/test_issues/test_i884/res.expect

@@ -0,0 +1,5 @@
+module: a
+  +--rw a?   string
+
+module: b
+  +--rw b?   string