annet 3.9.1__py3-none-any.whl → 3.9.3__py3-none-any.whl

annet/implicit.py

@@ -66,13 +66,13 @@ def _implicit_tree(device):
         elif device.hw.Huawei.Quidway.S5700.S5735I:
             text = """
                 !interface *
-                    port link-type access
+                    !port link-type access
                 interface NULL0
             """
         elif device.hw.Huawei.Quidway.S2x:
             text = """
                 !interface *
-                    port link-type hybrid
+                    !port link-type hybrid
                     dot1x enable
                 interface NULL0
             """

annet/tracing.py

@@ -6,7 +6,6 @@ from typing import Optional, Type, Union
 
 from annet.connectors import CachedConnector
 
-
 MinDurationT = Optional[Union[str, int]]
 
 
@@ -145,9 +144,9 @@ def function(arg=None, /, **outer_kwargs):
 
 def contextmanager(arg=None, /, **outer_kwargs):
     def decorator(cls_or_func):
-        if inspect.isfunction(cls_or_func):
-            cache = None
+        cache = None
 
+        if inspect.isfunction(cls_or_func):
             @contextlib.contextmanager
             @wraps(cls_or_func)
             def wrapper(*args, **kwargs):
@@ -159,12 +158,61 @@ def contextmanager(arg=None, /, **outer_kwargs):
 
             return wrapper
         else:
-            @wraps(cls_or_func.__enter__)
-            def enter(*args, **kwargs):
-                tracing_connector.get().contextmanager(cls_or_func, **outer_kwargs)  # redefine __enter__ and __exit__
-                return cls_or_func.__enter__(*args, **kwargs)  # pylint: disable=unnecessary-dunder-call
+            original_enter = cls_or_func.__enter__
+            original_exit = cls_or_func.__exit__
+
+            @wraps(original_enter)
+            def one_shot_enter(*args, **kwargs):
+                """Wrap after first call, tracing_connector was set up"""
+                nonlocal cache
+                if cache is None:
+                    cls_or_func.__enter__ = original_enter
+                    cls_or_func.__exit__ = original_exit
+                    cache = tracing_connector.get().contextmanager(cls_or_func, **outer_kwargs)
+                return cache.__enter__(*args, **kwargs)  # pylint: disable=unnecessary-dunder-call
+
+            @wraps(original_exit)
+            def one_shot_exit(*args, **kwargs):
+                nonlocal cache
+                return cache.__exit__(*args, **kwargs)
+
+            setattr(cls_or_func, "__enter__", one_shot_enter)
+            setattr(cls_or_func, "__exit__", one_shot_exit)
 
-            setattr(cls_or_func, "__enter__", enter)
             return cls_or_func
 
     return decorator if arg is None else decorator(arg)
+
+
+def class_methods(arg=None, /, **outer_kwargs):
+    def decorator(cls):
+        has_enter, has_exit = False, False
+
+        for name, attr in inspect.getmembers(cls, lambda x: (
+            inspect.isroutine(x)
+            and not inspect.ismethoddescriptor(x)
+            and not inspect.isbuiltin(x)
+        )):
+            if getattr(attr, "_disable_class_methods", False):
+                continue
+            if name == "__enter__":
+                has_enter = True
+            elif name == "__exit__":
+                has_exit = True
+            else:
+                method = function(**outer_kwargs)(attr)
+                if isinstance(inspect.getattr_static(cls, name), staticmethod):
+                    method = staticmethod(method)
+                setattr(cls, name, method)
+
+        if all((has_enter, has_exit)):
+            cls = contextmanager(**outer_kwargs)(cls)
+
+        return cls
+
+    return decorator if arg is None else decorator(arg)
+
+
+def disable_class_methods(func):
+    setattr(func, "_disable_class_methods", True)
+    return func

{annet-3.9.1.dist-info → annet-3.9.3.dist-info}/METADATA

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

{annet-3.9.1.dist-info → annet-3.9.3.dist-info}/RECORD

@@ -12,7 +12,7 @@ annet/executor.py,sha256=INlWAZFLpHurg8GTXclbSzaeSIXgZo4ccmcRulQqr88,5130
 annet/filtering.py,sha256=ZtqxPsKdV9reZoRxtQyBg22BqyMqd-2SotYcxZ-68AQ,903
 annet/gen.py,sha256=y9e7P551uJ-thjBS2p-ZRMgwQa8kPF_JAoEXJ3am77Y,30683
 annet/hardware.py,sha256=O2uadehcavZ10ssPr-db3XYHK8cpbG7C7XFkO-I6r_s,1161
-annet/implicit.py,sha256=qdAV6M0rGv_UmUU87593PBUfjPAD2clcRZQOs7J3wpY,6657
+annet/implicit.py,sha256=xR9YcTsmmMmnxL0WQqfKJSNAt6Q6wlm6ivVtiScswLI,6659
 annet/lib.py,sha256=4N4X6jCCrig5rk7Ua4AofrV9zK9jhzkBq57fLsfBJjw,4812
 annet/output.py,sha256=se8EpyNS9f9kPOlOaAV0ht4DjzDoBr8F2UafiezLPYw,7743
 annet/parallel.py,sha256=yM53RYaSpbIOUuBx4y07B_3jW8J-w3taiZWjcq_1r6A,17397
@@ -20,7 +20,7 @@ annet/patching.py,sha256=nILbY5oJajN0b1j3f0HEJm05H3HVThnWvB7vDVh7UQw,559
 annet/reference.py,sha256=B8mH8VUMcecPnzULiTVb_kTQ7jQrCL7zp4pfIZQa5fk,4035
 annet/storage.py,sha256=44f2aHNFOsQMSJwFvGxyu26oRcs3QmS24TKivcfPlxU,4064
 annet/text_term_format.py,sha256=y0U6VuFEAEil8Ab3HB8DBbVHisu31EHiRV7AOVruCeA,2816
-annet/tracing.py,sha256=ndpM-au1c88uBBpOuH_z52qWZL773edYozNyys_wA68,4044
+annet/tracing.py,sha256=GpFULDQroXREXzRkXvotA15O1QRcia15kGOqGeBQDig,5668
 annet/types.py,sha256=f2HwqoKa6AucwFwDMszoouB6m1B8n6VmdjHMktO30Kc,7175
 annet/adapters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/adapters/fetchers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -200,8 +200,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.9.1.dist-info/licenses/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-3.9.1.dist-info/licenses/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-3.9.3.dist-info/licenses/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-3.9.3.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
@@ -214,8 +214,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.9.1.dist-info/METADATA,sha256=CAUGJZraaKU9c-4Cl2oZNijqyFWgRvjL78cQpITKM_w,815
-annet-3.9.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-annet-3.9.1.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-3.9.1.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-3.9.1.dist-info/RECORD,,
+annet-3.9.3.dist-info/METADATA,sha256=9nMZSogPh79v5jBuhfrcLwRXcSRLVyQL7IpH4q-f9Ck,815
+annet-3.9.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+annet-3.9.3.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
+annet-3.9.3.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-3.9.3.dist-info/RECORD,,