annet 0.16.22__tar.gz → 0.16.24__tar.gz

{annet-0.16.22/annet.egg-info → annet-0.16.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: annet
-Version: 0.16.22
+Version: 0.16.24
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT

{annet-0.16.22 → annet-0.16.24}/annet/annlib/tabparser.py

@@ -354,15 +354,12 @@ class ArubaFormatter(BlockExitFormatter):
         return self.split_remove_spaces(text)
 
 
-class AristaFormatter(CiscoFormatter):
-
-    def block_exit(self, context: Optional[FormatterContext]) -> str:
-        current = context and context.row or ""
+class AristaFormatter(BlockExitFormatter):
+    def __init__(self, indent="  "):
+        super().__init__("exit", indent)
 
-        if current.startswith(("address-family")):
-            yield from block_wrapper("exit")
-        else:
-            yield from super().block_exit(context)
+    def split(self, text):
+        return self.split_remove_spaces(text)
 
 
 class AsrFormatter(BlockExitFormatter):

{annet-0.16.22 → annet-0.16.24}/annet/api/__init__.py

@@ -799,12 +799,20 @@ def guess_hw(config_text: str):
         hw = hw_provider.vendor_to_hw(vendor)
         fmtr = tabparser.make_formatter(hw)
         rb = rulebook.get_rulebook(hw)
-        config = tabparser.parse_to_tree(config_text, fmtr.split)
+        try:
+            config = tabparser.parse_to_tree(config_text, fmtr.split)
+        except Exception:
+            continue
         pre = patching.make_pre(patching.make_diff({}, config, rb, []))
         metric = _count_pre_score(pre)
         scores[metric] = hw
+
+    if not scores:
+        raise RuntimeError("No formatter was guessed")
+
     max_score = max(scores.keys())
     hw = scores[max_score]
+
     return hw, max_score
 
 

{annet-0.16.22 → annet-0.16.24/annet.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: annet
-Version: 0.16.22
+Version: 0.16.24
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT