annet 3.14.0__py3-none-any.whl → 3.14.1__py3-none-any.whl

annet/vendors/tabparser.py

@@ -694,46 +694,35 @@ class RosFormatter(CommonFormatter):
         is_patch: bool,
         context: Optional[FormatterContext] = None
     ):
-        rows = []
-
         if is_patch:
-            items = ((item.row, item.child, item.context) for item in tree.itms)
-        else:
-            items = ((row, child, {}) for row, child in tree.items())
+            raise RuntimeError("Ros not supported blocks in patch")
 
+        rows = []
+
+        items = ((row, child, {}) for row, child in tree.items())
         for row, sub_config, row_context in items:
-            if sub_config or (is_patch and sub_config is not None):
-                rows.append((row, sub_config, row_context))
-            else:
-                rows.append((row, None, row_context))
+            rows.append((row, sub_config if sub_config else None, row_context))
 
-        prev_prow = None
-        prev_prow_context = {}
         for sub_config, row_group in itertools.groupby(rows, lambda x: x[1]):
             if sub_config is None:
-                if prev_prow:
-                    yield prev_prow, prev_prow_context
-                    yield BlockBegin, None
+                blocks, leaf = [], context
+                while leaf:
+                    if leaf.current:
+                        blocks.append(leaf.current[0])
+                    leaf = leaf.parent
+
+                yield " ".join(reversed(blocks)), None
+                yield BlockBegin, None
                 for row, _, row_context in row_group:
                     yield row, row_context
-                if prev_prow:
-                    yield BlockEnd, None
+                yield BlockEnd, None
             else:
                 for row, _, row_context in row_group:
-                    if context and context.parent and context.parent.row:
-                        prev_prow, prev_prow_context = context.parent.current
-                        prow = f"{context.parent.row} {row}"
-                    else:
-                        prow = row
-                    yield prow, row_context
-
-                    yield BlockBegin, None
                     yield from self.blocks_and_context(
                         sub_config,
                         is_patch,
-                        context=FormatterContext(parent=context, current=(prow, row_context))
+                        context=FormatterContext(parent=context, current=(row, row_context))
                     )
-                    yield BlockEnd, None
 
     def _formatted_blocks(self, blocks):
         line = None

{annet-3.14.0.dist-info → annet-3.14.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: annet
-Version: 3.14.0
+Version: 3.14.1
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT

{annet-3.14.0.dist-info → annet-3.14.1.dist-info}/RECORD

@@ -183,7 +183,7 @@ annet/rulebook/texts/routeros.rul,sha256=ipfxjj0mjFef6IsUlupqx4BY_Je_OUb8u_U1019
 annet/vendors/__init__.py,sha256=gQcDFlKeWDZB6vxJ_MdPWEoE-C5dg-YgXvgGkuV9YLw,569
 annet/vendors/base.py,sha256=AmM3--gqC-Rpw5Xu_-hqthWZ9EoZRL8x6eOHwadZGbo,1145
 annet/vendors/registry.py,sha256=LgPg4oxWrgxsfpLpJ6OWEGFmUzlVlHzziSXsZTi82uc,2540
-annet/vendors/tabparser.py,sha256=yRe4EdwP_-ptynmzB7qhqFlFAnGNxGjhTM9EW-WwxPA,32177
+annet/vendors/tabparser.py,sha256=-wu5ErbTKtAl4SWGhXG0R1EkDbZkJcCC_7_ZkDpBEuk,31701
 annet/vendors/library/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/vendors/library/arista.py,sha256=J4ltZ7sS_TgIECg2U7fizvxwfS4-s35Of0tNDNWWYbE,1302
 annet/vendors/library/aruba.py,sha256=tvrSFSA43n0uelCv-NLQnqxO01d0y2mrfhncpOX7zoQ,1257
@@ -199,8 +199,8 @@ annet/vendors/library/optixtrans.py,sha256=VdME69Ca4HAEgoaKN21fZxnmmsqqaxOe_HZja
 annet/vendors/library/pc.py,sha256=vfv31_NPi7M-4AUDL89UcpawK2E6xvCpELA209cd1ho,1086
 annet/vendors/library/ribbon.py,sha256=DDOBq-_-FL9dCxqXs2inEWZ-pvw-dJ-A-prA7cKMhec,1216
 annet/vendors/library/routeros.py,sha256=iQa7m_4wjuvcgBOI9gyZwlw1BvzJfOkvUbyoEk-NI9I,1254
-annet-3.14.0.dist-info/licenses/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-3.14.0.dist-info/licenses/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-3.14.1.dist-info/licenses/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-3.14.1.dist-info/licenses/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
 annet_generators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet_generators/example/__init__.py,sha256=OJ77uj8axc-FIyIu_Xdcnzmde3oQW5mk5qbODkhuVc8,355
 annet_generators/example/hostname.py,sha256=RloLzNVetEoWPLITzfJ13Nk3CC0yi-cZB1RTd6dnuhI,2541
@@ -213,8 +213,8 @@ annet_generators/rpl_example/generator.py,sha256=EWah19gOH8G-QyNyWqxCqdRi0BK7GbM
 annet_generators/rpl_example/items.py,sha256=HPgxScDvSqJPdz0c2SppDrH82DZYC4zUaniQwcWmh4A,1176
 annet_generators/rpl_example/mesh.py,sha256=z_WgfDZZ4xnyh3cSf75igyH09hGvtexEVwy1gCD_DzA,288
 annet_generators/rpl_example/route_policy.py,sha256=z6nPb0VDeQtKD1NIg9sFvmUxBD5tVs2frfNIuKdM-5c,2318
-annet-3.14.0.dist-info/METADATA,sha256=WWGistGQb0jfdrMuperiDpOYUkyo2lgO2oouTHFoPA8,816
-annet-3.14.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-annet-3.14.0.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-3.14.0.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-3.14.0.dist-info/RECORD,,
+annet-3.14.1.dist-info/METADATA,sha256=BKLGnMeB4wRe5P-wSYsu3zPFBxoTIS6_y75rZJ6lz04,816
+annet-3.14.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+annet-3.14.1.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
+annet-3.14.1.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-3.14.1.dist-info/RECORD,,