trigger 2.3.1__tar.gz → 2.3.3__tar.gz

{trigger-2.3.1/trigger.egg-info → trigger-2.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trigger
-Version: 2.3.1
+Version: 2.3.3
 Summary: Network automation toolkit for managing network devices
 Author-email: Jathan McCollum <jathan@gmail.com>
 License-Expression: BSD-3-Clause
@@ -15,7 +15,7 @@ License-File: LICENSE.md
 License-File: AUTHORS.md
 Requires-Dist: netaddr<2,>=1.0.0
 Requires-Dist: cryptography>=41.0.0
-Requires-Dist: Twisted>=22.10.0
+Requires-Dist: Twisted[tls]>=22.10.0
 Requires-Dist: crochet>=2.0.0
 Requires-Dist: pyasn1>=0.4.8
 Requires-Dist: pyparsing>=3.1.0

{trigger-2.3.1 → trigger-2.3.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "trigger"
-version = "2.3.1"
+version = "2.3.3"
 description = "Network automation toolkit for managing network devices"
 readme = "README.md"
 license = "BSD-3-Clause"
@@ -20,7 +20,7 @@ classifiers = [
 dependencies = [
     "netaddr>=1.0.0,<2",
     "cryptography>=41.0.0",
-    "Twisted>=22.10.0",
+    "Twisted[tls]>=22.10.0",
     "crochet>=2.0.0",
     "pyasn1>=0.4.8",
     "pyparsing>=3.1.0",
@@ -119,6 +119,9 @@ ignore = [
 
     # --- Kept from v2.0.0 baseline ---
     "E501",     # line-too-long (handled by formatter)
+    "PLR0917",  # too-many-positional-arguments (newly enforced in ruff 0.16;
+                # incompatible with Twisted-style long method signatures
+                # used throughout the codebase)
 ]
 
 [tool.ruff.lint.pydocstyle]

{trigger-2.3.1 → trigger-2.3.3}/tests/test_acl.py

@@ -392,6 +392,77 @@ ipv4 access-list BLAHBLAH
             self.assertRaises(exceptions.BadACLName, a.output_ios)
 
 
+class CheckStringification(unittest.TestCase):
+    """Test str() and family kwarg tolerance of ACL output methods.
+
+    Regression tests for issue #397: ACL.__str__ always forwards
+    ``family=self.family`` through ACL.output(), but only output_junos()
+    accepted it, so str() raised TypeError for every other format.
+    """
+
+    def setUp(self):
+        super().setUp()
+        self.a = acl.ACL(name="BLAHBLAH")
+        self.t1 = acl.Term(name="p99")
+        self.t1.match["protocol"] = ["tcp"]
+        self.t1.match["source-address"] = ["192.0.2.0/24"]
+        self.t1.match["destination-port"] = [22]
+        self.t1.action = "accept"
+        self.a.terms.append(self.t1)
+
+    def _check_str(self, fmt, name="BLAHBLAH", term_name="p99"):
+        """Helper: str() renders without TypeError for the given format."""
+        self.a.format = fmt
+        self.a.name = name
+        self.t1.name = term_name
+        lines = str(self.a).splitlines()
+        self.assertTrue(lines)
+        return lines
+
+    def testStrJunOS(self):
+        """Test str() on a JunOS ACL"""
+        self._check_str("junos", "100j")
+
+    def testStrIOS(self):
+        """Test str() on a traditional IOS ACL"""
+        self._check_str("ios", "100", term_name=None)
+
+    def testStrIOSNamed(self):
+        """Test str() on a named IOS ACL (the #397 crash)"""
+        lines = self._check_str("ios_named")
+        self.assertEqual(lines[0], "ip access-list extended BLAHBLAH")
+
+    def testStrIOSXR(self):
+        """Test str() on an IOS XR ACL"""
+        self._check_str("iosxr", term_name=None)
+
+    def testStrIOSBrocade(self):
+        """Test str() on a Brocade-flavored IOS ACL"""
+        self._check_str("ios_brocade", "100", term_name=None)
+
+    def testParseStrRoundTrip(self):
+        """Test str() on a parsed named IOS ACL round-trips (issue #397 repro)"""
+        text = "ip access-list extended SMOKE\n permit tcp host 10.20.30.40 any eq 22\n deny ip any any log\n"
+        a = acl.parse(text)
+        self.assertEqual(str(a), text.strip())
+
+    def testFamilyKwargAccepted(self):
+        """Test ACL-level output methods accept and ignore family kwarg"""
+        for fmt, name, term_name in (
+            ("junos", "100j", "p99"),
+            ("ios", "100", None),
+            ("ios_named", "BLAHBLAH", "p99"),
+            ("iosxr", "BLAHBLAH", None),
+            ("ios_brocade", "100", None),
+        ):
+            self.a.format = fmt
+            self.a.name = name
+            self.t1.name = term_name
+            with_family = self.a.output(family="inet")
+            without_family = self.a.output()
+            self.assertEqual(with_family, without_family, f"format={fmt}")
+
+
 class CheckIOSParseAndOutput(unittest.TestCase):
     """Test parsing of IOS ACLs"""
 

trigger-2.3.3/tests/test_tls_deps.py

@@ -0,0 +1,31 @@
+"""Regression tests for TLS dependency availability (issue #398).
+
+pyOpenSSL used to arrive transitively (old service-identity hard-required
+it; Twisted only ships it with the ``[tls]`` extra). When that changed,
+fresh installs got a trigger whose Twisted TLS paths failed with
+``ModuleNotFoundError: No module named 'OpenSSL'``. These tests keep the
+TLS stack import-honest.
+"""
+
+import pytest
+
+
+def test_pyopenssl_installed():
+    """Test that pyOpenSSL is importable."""
+    OpenSSL = pytest.importorskip("OpenSSL")
+    assert OpenSSL.__version__
+
+
+def test_twisted_tls_stack():
+    """Test that Twisted's TLS context factory is importable.
+
+    DefaultOpenSSLContextFactory is the code path used by
+    trigger.contrib.xmlrpc.server.
+    """
+    ssl = pytest.importorskip("twisted.internet.ssl")
+    assert hasattr(ssl, "DefaultOpenSSLContextFactory")
+
+
+def test_service_identity_pyopenssl_hooks():
+    """Test that service_identity's pyOpenSSL verification hooks load."""
+    pytest.importorskip("service_identity.pyopenssl")

{trigger-2.3.1 → trigger-2.3.3}/trigger/acl/support.py

@@ -758,10 +758,13 @@ class ACL:
 
         return out
 
-    def output_ios(self, replace=False):
+    def output_ios(self, replace=False, family=None):
         """Output the ACL in IOS traditional format.
 
         :param replace: If set the ACL is preceded by a ``no access-list`` line.
+        :param family: Accepted for signature compatibility with
+            :meth:`~ACL.output_junos`, but ignored -- ``family inet/inet6``
+            wrapping is a JunOS-only concept.
         """
         if self.name is None:
             msg = "IOS format requires a name"
@@ -785,7 +788,7 @@ class ACL:
             out += [x for x in t.output_ios(prefix)]
         return out
 
-    def output_ios_brocade(self, replace=False, receive_acl=False):
+    def output_ios_brocade(self, replace=False, receive_acl=False, family=None):
         """Output the ACL in Brocade-flavored IOS format.
 
         The difference between this and "traditional" IOS are:
@@ -796,6 +799,9 @@ class ACL:
         :param replace: If set the ACL is preceded by a ``no access-list`` line.
         :param receive_acl: If set the ACL is suffixed with a ``ip
             rebind-receive-acl' instead of ``ip rebind-acl``.
+        :param family: Accepted for signature compatibility with
+            :meth:`~ACL.output_junos`, but ignored -- ``family inet/inet6``
+            wrapping is a JunOS-only concept.
         """
         self.strip_comments()
 
@@ -812,10 +818,13 @@ class ACL:
 
         return out
 
-    def output_ios_named(self, replace=False):
+    def output_ios_named(self, replace=False, family=None):
         """Output the ACL in IOS named format.
 
         :param replace: If set the ACL is preceded by a ``no access-list`` line.
+        :param family: Accepted for signature compatibility with
+            :meth:`~ACL.output_junos`, but ignored -- ``family inet/inet6``
+            wrapping is a JunOS-only concept.
         """
         if self.name is None:
             msg = "IOS format requires a name"
@@ -831,10 +840,13 @@ class ACL:
             out += [x for x in t.output_ios_named(" ")]
         return out
 
-    def output_iosxr(self, replace=False):
+    def output_iosxr(self, replace=False, family=None):
         """Output the ACL in IOS XR format.
 
         :param replace: If set the ACL is preceded by a ``no ipv4 access-list`` line.
+        :param family: Accepted for signature compatibility with
+            :meth:`~ACL.output_junos`, but ignored -- ``family inet/inet6``
+            wrapping is a JunOS-only concept.
         """
         if self.name is None:
             msg = "IOS XR format requires a name"

{trigger-2.3.1 → trigger-2.3.3/trigger.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trigger
-Version: 2.3.1
+Version: 2.3.3
 Summary: Network automation toolkit for managing network devices
 Author-email: Jathan McCollum <jathan@gmail.com>
 License-Expression: BSD-3-Clause
@@ -15,7 +15,7 @@ License-File: LICENSE.md
 License-File: AUTHORS.md
 Requires-Dist: netaddr<2,>=1.0.0
 Requires-Dist: cryptography>=41.0.0
-Requires-Dist: Twisted>=22.10.0
+Requires-Dist: Twisted[tls]>=22.10.0
 Requires-Dist: crochet>=2.0.0
 Requires-Dist: pyasn1>=0.4.8
 Requires-Dist: pyparsing>=3.1.0

{trigger-2.3.1 → trigger-2.3.3}/trigger.egg-info/SOURCES.txt

@@ -11,6 +11,7 @@ tests/test_netdevices.py
 tests/test_scripts.py
 tests/test_tacacsrc.py
 tests/test_templates.py
+tests/test_tls_deps.py
 tests/test_twister.py
 tests/test_twister2.py
 tests/test_utils.py

{trigger-2.3.1 → trigger-2.3.3}/trigger.egg-info/requires.txt

@@ -1,6 +1,6 @@
 netaddr<2,>=1.0.0
 cryptography>=41.0.0
-Twisted>=22.10.0
+Twisted[tls]>=22.10.0
 crochet>=2.0.0
 pyasn1>=0.4.8
 pyparsing>=3.1.0