scrapli 2023.7.30__tar.gz → 2024.7.30__tar.gz

{scrapli-2023.7.30/scrapli.egg-info → scrapli-2024.7.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scrapli
-Version: 2023.7.30
+Version: 2024.7.30
 Summary: Fast, flexible, sync/async, Python 3.7+ screen scraping client specifically for network devices
 Author-email: Carl Montanari <carl.r.montanari@gmail.com>
 License: MIT License
@@ -33,25 +33,96 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Operating System :: MacOS
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.7
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
+License-File: LICENSE
+Provides-Extra: dev-darwin
+Requires-Dist: black<25.0.0,>=23.3.0; extra == "dev-darwin"
+Requires-Dist: darglint<2.0.0,>=1.8.1; extra == "dev-darwin"
+Requires-Dist: isort<6.0.0,>=5.10.1; extra == "dev-darwin"
+Requires-Dist: mypy<2.0.0,>=1.4.1; extra == "dev-darwin"
+Requires-Dist: nox==2024.4.15; extra == "dev-darwin"
+Requires-Dist: pycodestyle<3.0.0,>=2.8.0; extra == "dev-darwin"
+Requires-Dist: pydocstyle<7.0.0,>=6.1.1; extra == "dev-darwin"
+Requires-Dist: pyfakefs<6.0.0,>=5.4.1; extra == "dev-darwin"
+Requires-Dist: pylama<9.0.0,>=8.4.0; extra == "dev-darwin"
+Requires-Dist: pylint<4.0.0,>=3.0.0; extra == "dev-darwin"
+Requires-Dist: pytest-asyncio<1.0.0,>=0.17.0; extra == "dev-darwin"
+Requires-Dist: pytest-cov<5.0.0,>=3.0.0; extra == "dev-darwin"
+Requires-Dist: pytest<8.0.0,>=7.0.0; extra == "dev-darwin"
+Requires-Dist: scrapli-cfg==2023.7.30; extra == "dev-darwin"
+Requires-Dist: scrapli-replay==2023.7.30; extra == "dev-darwin"
+Requires-Dist: toml<1.0.0,>=0.10.2; extra == "dev-darwin"
+Requires-Dist: types-paramiko<4.0.0,>=2.8.6; extra == "dev-darwin"
+Requires-Dist: types-pkg-resources<1.0.0,>=0.1.3; extra == "dev-darwin"
+Requires-Dist: ntc-templates<5.0.0,>=1.1.0; extra == "dev-darwin"
+Requires-Dist: textfsm<2.0.0,>=1.1.0; extra == "dev-darwin"
+Requires-Dist: genie<24.4,>=20.2; (sys_platform != "win32" and python_version < "3.11") and extra == "dev-darwin"
+Requires-Dist: pyats>=20.2; (sys_platform != "win32" and python_version < "3.11") and extra == "dev-darwin"
+Requires-Dist: ttp<1.0.0,>=0.5.0; extra == "dev-darwin"
+Requires-Dist: paramiko<4.0.0,>=2.6.0; extra == "dev-darwin"
+Requires-Dist: asyncssh<3.0.0,>=2.2.1; extra == "dev-darwin"
+Requires-Dist: scrapli_community>=2021.01.30; extra == "dev-darwin"
 Provides-Extra: dev
+Requires-Dist: black<25.0.0,>=23.3.0; extra == "dev"
+Requires-Dist: darglint<2.0.0,>=1.8.1; extra == "dev"
+Requires-Dist: isort<6.0.0,>=5.10.1; extra == "dev"
+Requires-Dist: mypy<2.0.0,>=1.4.1; extra == "dev"
+Requires-Dist: nox==2024.4.15; extra == "dev"
+Requires-Dist: pycodestyle<3.0.0,>=2.8.0; extra == "dev"
+Requires-Dist: pydocstyle<7.0.0,>=6.1.1; extra == "dev"
+Requires-Dist: pyfakefs<6.0.0,>=5.4.1; extra == "dev"
+Requires-Dist: pylama<9.0.0,>=8.4.0; extra == "dev"
+Requires-Dist: pylint<4.0.0,>=3.0.0; extra == "dev"
+Requires-Dist: pytest-asyncio<1.0.0,>=0.17.0; extra == "dev"
+Requires-Dist: pytest-cov<5.0.0,>=3.0.0; extra == "dev"
+Requires-Dist: pytest<8.0.0,>=7.0.0; extra == "dev"
+Requires-Dist: scrapli-cfg==2023.7.30; extra == "dev"
+Requires-Dist: scrapli-replay==2023.7.30; extra == "dev"
+Requires-Dist: toml<1.0.0,>=0.10.2; extra == "dev"
+Requires-Dist: types-paramiko<4.0.0,>=2.8.6; extra == "dev"
+Requires-Dist: types-pkg-resources<1.0.0,>=0.1.3; extra == "dev"
+Requires-Dist: ntc-templates<5.0.0,>=1.1.0; extra == "dev"
+Requires-Dist: textfsm<2.0.0,>=1.1.0; extra == "dev"
+Requires-Dist: genie<24.4,>=20.2; (sys_platform != "win32" and python_version < "3.11") and extra == "dev"
+Requires-Dist: pyats>=20.2; (sys_platform != "win32" and python_version < "3.11") and extra == "dev"
+Requires-Dist: ttp<1.0.0,>=0.5.0; extra == "dev"
+Requires-Dist: paramiko<4.0.0,>=2.6.0; extra == "dev"
+Requires-Dist: ssh2-python<2.0.0,>=0.23.0; python_version < "3.12" and extra == "dev"
+Requires-Dist: asyncssh<3.0.0,>=2.2.1; extra == "dev"
+Requires-Dist: scrapli_community>=2021.01.30; extra == "dev"
 Provides-Extra: docs
+Requires-Dist: mdx-gh-links<1.0,>=0.2; extra == "docs"
+Requires-Dist: mkdocs<2.0.0,>=1.2.3; extra == "docs"
+Requires-Dist: mkdocs-gen-files<1.0.0,>=0.4.0; extra == "docs"
+Requires-Dist: mkdocs-literate-nav<1.0.0,>=0.5.0; extra == "docs"
+Requires-Dist: mkdocs-material<10.0.0,>=8.1.6; extra == "docs"
+Requires-Dist: mkdocs-material-extensions<2.0.0,>=1.0.3; extra == "docs"
+Requires-Dist: mkdocs-section-index<1.0.0,>=0.3.4; extra == "docs"
+Requires-Dist: mkdocstrings[python]<1.0.0,>=0.19.0; extra == "docs"
 Provides-Extra: textfsm
+Requires-Dist: ntc-templates<5.0.0,>=1.1.0; extra == "textfsm"
+Requires-Dist: textfsm<2.0.0,>=1.1.0; extra == "textfsm"
 Provides-Extra: genie
+Requires-Dist: genie<24.4,>=20.2; (sys_platform != "win32" and python_version < "3.11") and extra == "genie"
+Requires-Dist: pyats>=20.2; (sys_platform != "win32" and python_version < "3.11") and extra == "genie"
 Provides-Extra: ttp
+Requires-Dist: ttp<1.0.0,>=0.5.0; extra == "ttp"
 Provides-Extra: paramiko
+Requires-Dist: paramiko<4.0.0,>=2.6.0; extra == "paramiko"
 Provides-Extra: ssh2
+Requires-Dist: ssh2-python<2.0.0,>=0.23.0; python_version < "3.12" and extra == "ssh2"
 Provides-Extra: asyncssh
+Requires-Dist: asyncssh<3.0.0,>=2.2.1; extra == "asyncssh"
 Provides-Extra: community
-License-File: LICENSE
+Requires-Dist: scrapli_community>=2021.01.30; extra == "community"
 
 <p center><a href=""><img src=https://github.com/carlmontanari/scrapli/blob/main/scrapli.svg?sanitize=true/></a></p>
 

{scrapli-2023.7.30 → scrapli-2024.7.30}/pyproject.toml

@@ -28,17 +28,17 @@ license = { file = "LICENSE" }
 authors = [
     { name = "Carl Montanari", email = "carl.r.montanari@gmail.com" },
 ]
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 classifiers = [
     "License :: OSI Approved :: MIT License",
     "Operating System :: POSIX :: Linux",
     "Operating System :: MacOS",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3 :: Only",
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
@@ -55,6 +55,16 @@ Homepage = "https://github.com/carlmontanari/scrapli"
 [tool.setuptools.dynamic]
 version = { attr = "scrapli.__version__" }
 dependencies = { file = "requirements.txt" }
+# dev-darwin is same as dev but excludes ssh2-python
+optional-dependencies.dev-darwin = { file = [
+    "requirements-dev.txt",
+    "requirements-textfsm.txt",
+    "requirements-genie.txt",
+    "requirements-ttp.txt",
+    "requirements-paramiko.txt",
+    "requirements-asyncssh.txt",
+    "requirements-community.txt",
+] }
 optional-dependencies.dev = { file = [
     "requirements-dev.txt",
     "requirements-textfsm.txt",

{scrapli-2023.7.30 → scrapli-2024.7.30}/requirements-dev.txt

@@ -1,18 +1,18 @@
-black>=23.3.0,<24.0.0
+black>=23.3.0,<25.0.0
 darglint>=1.8.1,<2.0.0
 isort>=5.10.1,<6.0.0
-mypy==1.4.1
-nox==2023.4.22
+mypy>=1.4.1,<2.0.0
+nox==2024.4.15
 pycodestyle>=2.8.0,<3.0.0
 pydocstyle>=6.1.1,<7.0.0
-pyfakefs>=5.0.0,<6.0.0
+pyfakefs>=5.4.1,<6.0.0
 pylama>=8.4.0,<9.0.0
-pylint==2.17.5
+pylint>=3.0.0,<4.0.0
 pytest-asyncio>=0.17.0,<1.0.0
 pytest-cov>=3.0.0,<5.0.0
 pytest>=7.0.0,<8.0.0
-scrapli-cfg==2022.7.30
-scrapli-replay==2022.7.30
+scrapli-cfg==2023.7.30
+scrapli-replay==2023.7.30
 toml>=0.10.2,<1.0.0
 types-paramiko>=2.8.6,<4.0.0
 types-pkg-resources>=0.1.3,<1.0.0

scrapli-2024.7.30/requirements-genie.txt

@@ -0,0 +1,2 @@
+genie>=20.2,<24.4 ; sys_platform != "win32" and python_version < "3.11"
+pyats>=20.2 ; sys_platform != "win32" and python_version < "3.11"

scrapli-2024.7.30/requirements-paramiko.txt

@@ -0,0 +1 @@
+paramiko>=2.6.0,<4.0.0

scrapli-2024.7.30/requirements-textfsm.txt

@@ -0,0 +1,2 @@
+ntc-templates>=1.1.0,<5.0.0
+textfsm>=1.1.0,<2.0.0

{scrapli-2023.7.30 → scrapli-2024.7.30}/scrapli/__init__.py

@@ -1,8 +1,9 @@
 """scrapli"""
+
 from scrapli.driver.base import AsyncDriver, Driver
 from scrapli.factory import AsyncScrapli, Scrapli
 
-__version__ = "2023.07.30"
+__version__ = "2024.07.30"
 
 __all__ = (
     "AsyncDriver",

{scrapli-2023.7.30 → scrapli-2024.7.30}/scrapli/channel/__init__.py

@@ -1,4 +1,5 @@
 """scrapli.channel"""
+
 from scrapli.channel.async_channel import AsyncChannel
 from scrapli.channel.sync_channel import Channel
 

{scrapli-2023.7.30 → scrapli-2024.7.30}/scrapli/channel/async_channel.py

@@ -1,4 +1,5 @@
 """scrapli.channel.async_channel"""
+
 import asyncio
 import re
 import time
@@ -10,6 +11,7 @@ from typing import AsyncIterator, List, Optional, Tuple
 from scrapli.channel.base_channel import BaseChannel, BaseChannelArgs
 from scrapli.decorators import timeout_wrapper
 from scrapli.exceptions import ScrapliAuthenticationFailed, ScrapliTimeout
+from scrapli.helper import output_roughly_contains_input
 from scrapli.transport.base import AsyncTransport
 
 
@@ -69,7 +71,7 @@ class AsyncChannel(BaseChannel):
         buf = await self.transport.read()
         buf = buf.replace(b"\r", b"")
 
-        self.logger.debug(f"read: {buf!r}")
+        self.logger.debug("read: %r", buf)
 
         if self.channel_log:
             self.channel_log.write(buf)
@@ -104,9 +106,16 @@ class AsyncChannel(BaseChannel):
         while True:
             buf += await self.read()
 
-            # replace any backspace chars (particular problem w/ junos), and remove any added spaces
-            # this is just for comparison of the inputs to what was read from channel
-            if processed_channel_input in b"".join(buf.lower().replace(b"\x08", b"").split()):
+            if not self._base_channel_args.comms_roughly_match_inputs:
+                # replace any backspace chars (particular problem w/ junos), and remove any added
+                # spaces this is just for comparison of the inputs to what was read from channel
+                # note (2024) this would be worked around by using the roughly contains search,
+                # *but* that is slower (probably immaterially for most people but... ya know...)
+                processed_buf = b"".join(buf.lower().replace(b"\x08", b"").split())
+
+                if processed_channel_input in processed_buf:
+                    return buf
+            elif output_roughly_contains_input(input_=processed_channel_input, output=buf):
                 return buf
 
     async def _read_until_prompt(self, buf: bytes = b"") -> bytes:
@@ -241,7 +250,7 @@ class AsyncChannel(BaseChannel):
 
             if (time.time() - start) > read_duration:
                 break
-            if any((channel_output in search_buf for channel_output in channel_outputs)):
+            if any(channel_output in search_buf for channel_output in channel_outputs):
                 break
             if re.search(pattern=regex_channel_outputs_pattern, string=search_buf):
                 break
@@ -455,6 +464,7 @@ class AsyncChannel(BaseChannel):
         *,
         strip_prompt: bool = True,
         eager: bool = False,
+        eager_input: bool = False,
     ) -> Tuple[bytes, bytes]:
         """
         Primary entry point to send data to devices in shell mode; accept input and returns result
@@ -465,6 +475,8 @@ class AsyncChannel(BaseChannel):
             eager: eager mode reads and returns the `_read_until_input` value, but does not attempt
                 to read to the prompt pattern -- this should not be used manually! (only used by
                 `send_configs` with the eager flag set)
+            eager_input: when true does *not* try to read our input off the channel -- generally
+                this should be left alone unless you know what you are doing!
 
         Returns:
             Tuple[bytes, bytes]: tuple of "raw" output and "processed" (cleaned up/stripped) output
@@ -479,12 +491,18 @@ class AsyncChannel(BaseChannel):
         bytes_channel_input = channel_input.encode()
 
         self.logger.info(
-            f"sending channel input: {channel_input}; strip_prompt: {strip_prompt}; eager: {eager}"
+            "sending channel input: %s; strip_prompt: %s; eager: %s",
+            channel_input,
+            strip_prompt,
+            eager,
         )
 
         async with self._channel_lock():
             self.write(channel_input=channel_input)
-            _buf_until_input = await self._read_until_input(channel_input=bytes_channel_input)
+
+            if not eager_input:
+                _buf_until_input = await self._read_until_input(channel_input=bytes_channel_input)
+
             self.send_return()
 
             if not eager:
@@ -531,8 +549,12 @@ class AsyncChannel(BaseChannel):
         ]
 
         self.logger.info(
-            f"sending channel input and read: {channel_input}; strip_prompt: {strip_prompt}; "
-            f"expected_outputs: {expected_outputs}; read_duration: {read_duration}"
+            "sending channel input and read: %s; strip_prompt: %s; "
+            "expected_outputs: %s; read_duration: %s",
+            channel_input,
+            strip_prompt,
+            expected_outputs,
+            read_duration,
         )
 
         async with self._channel_lock():
@@ -642,9 +664,10 @@ class AsyncChannel(BaseChannel):
 
                 _channel_input = channel_input if not hidden_input else "REDACTED"
                 self.logger.info(
-                    f"sending interactive input: {_channel_input}; "
-                    f"expecting: {channel_response}; "
-                    f"hidden_input: {hidden_input}"
+                    "sending interactive input: %s; expecting: %s; hidden_input: %s",
+                    _channel_input,
+                    channel_response,
+                    hidden_input,
                 )
 
                 self.write(channel_input=channel_input, redacted=bool(hidden_input))

{scrapli-2023.7.30 → scrapli-2024.7.30}/scrapli/channel/base_channel.py

@@ -1,4 +1,5 @@
 """scrapli.channel.base_channel"""
+
 import re
 from dataclasses import dataclass
 from datetime import datetime
@@ -10,7 +11,19 @@ from scrapli.exceptions import ScrapliAuthenticationFailed, ScrapliTypeError, Sc
 from scrapli.logging import get_instance_logger
 from scrapli.transport.base import AsyncTransport, Transport
 
-ANSI_ESCAPE_PATTERN = re.compile(rb"\x1b(\[.*?[@-~]|\].*?(\x07|\x1b\\)|E)")
+ANSI_ESCAPE_PATTERN = re.compile(
+    pattern=rb"[\x1B\x9B\x9D](\s)?"  # Prefix ESC (^) or CSI (^[) or OSC (^)
+    rb"("
+    rb"([78ME])"  # control cursor position
+    rb"|"
+    rb"((\]\d).*?[\x07])"  # BEL (Terminal bell)
+    rb"|"
+    rb"(\[.*?[@-~])"  # control codes starts with `[` e.x. ESC [2;37;41m
+    rb"|"
+    rb"(\[.*?[0-9;]m)"  # Select Graphic Rendition (SGR) control sequence
+    rb")",
+    flags=re.VERBOSE,
+)
 
 
 @dataclass()
@@ -31,6 +44,12 @@ class BaseChannelArgs:
         comms_prompt_search_depth: depth of the buffer to search in for searching for the prompt
             in "read_until_prompt"; smaller number here will generally be faster, though may be less
             reliable; default value is 1000
+        comms_roughly_match_inputs: indicates if the channel should "roughly" match inputs sent
+            to the device. If False (default) inputs are strictly checked, as in any input
+            *must* be read back exactly on the channel. When set to True all input chars *must*
+            be read back in order in the output and all chars must be present, but the *exact*
+            input string does not need to be seen. This can be useful if a device echoes back
+            extra characters or rewrites the terminal during command input.
         timeout_ops: timeout_ops to assign to the channel, see above
         channel_log: log "channel" output -- this would be the output you would normally see on a
             terminal. If `True` logs to `scrapli_channel.log`, if a string is provided, logs to
@@ -53,6 +72,7 @@ class BaseChannelArgs:
     comms_prompt_pattern: str = r"^[a-z0-9.\-@()/:]{1,32}[#>$]$"
     comms_return_char: str = "\n"
     comms_prompt_search_depth: int = 1000
+    comms_roughly_match_inputs: bool = False
     timeout_ops: float = 30.0
     channel_log: Union[str, bool, BytesIO] = False
     channel_log_mode: str = "write"
@@ -348,8 +368,10 @@ class BaseChannel:
             N/A
 
         """
-        log_output = "REDACTED" if redacted else repr(channel_input)
-        self.logger.debug(f"write: {log_output}")
+        if redacted:
+            self.logger.debug("write: REDACTED")
+        else:
+            self.logger.debug("write: %r", channel_input)
 
         self.transport.write(channel_input=channel_input.encode())
 

{scrapli-2023.7.30 → scrapli-2024.7.30}/scrapli/channel/sync_channel.py

@@ -1,4 +1,5 @@
 """scrapli.channel.sync_channel"""
+
 import re
 import time
 from contextlib import contextmanager, suppress
@@ -10,6 +11,7 @@ from typing import Iterator, List, Optional, Tuple
 from scrapli.channel.base_channel import BaseChannel, BaseChannelArgs
 from scrapli.decorators import timeout_wrapper
 from scrapli.exceptions import ScrapliAuthenticationFailed, ScrapliConnectionError, ScrapliTimeout
+from scrapli.helper import output_roughly_contains_input
 from scrapli.transport.base import Transport
 
 
@@ -69,7 +71,7 @@ class Channel(BaseChannel):
         buf = self.transport.read()
         buf = buf.replace(b"\r", b"")
 
-        self.logger.debug(f"read: {buf!r}")
+        self.logger.debug("read: %r", buf)
 
         if self.channel_log:
             self.channel_log.write(buf)
@@ -104,9 +106,16 @@ class Channel(BaseChannel):
         while True:
             buf += self.read()
 
-            # replace any backspace chars (particular problem w/ junos), and remove any added spaces
-            # this is just for comparison of the inputs to what was read from channel
-            if processed_channel_input in b"".join(buf.lower().replace(b"\x08", b"").split()):
+            if not self._base_channel_args.comms_roughly_match_inputs:
+                # replace any backspace chars (particular problem w/ junos), and remove any added
+                # spaces this is just for comparison of the inputs to what was read from channel
+                # note (2024) this would be worked around by using the roughly contains search,
+                # *but* that is slower (probably immaterially for most people but... ya know...)
+                processed_buf = b"".join(buf.lower().replace(b"\x08", b"").split())
+
+                if processed_channel_input in processed_buf:
+                    return buf
+            elif output_roughly_contains_input(input_=processed_channel_input, output=buf):
                 return buf
 
     def _read_until_prompt(self, buf: bytes = b"") -> bytes:
@@ -238,7 +247,7 @@ class Channel(BaseChannel):
 
             if (time.time() - start) > read_duration:
                 break
-            if any((channel_output in search_buf for channel_output in channel_outputs)):
+            if any(channel_output in search_buf for channel_output in channel_outputs):
                 break
             if re.search(pattern=regex_channel_outputs_pattern, string=search_buf):
                 break
@@ -456,6 +465,7 @@ class Channel(BaseChannel):
         *,
         strip_prompt: bool = True,
         eager: bool = False,
+        eager_input: bool = False,
     ) -> Tuple[bytes, bytes]:
         """
         Primary entry point to send data to devices in shell mode; accept input and returns result
@@ -466,6 +476,8 @@ class Channel(BaseChannel):
             eager: eager mode reads and returns the `_read_until_input` value, but does not attempt
                 to read to the prompt pattern -- this should not be used manually! (only used by
                 `send_configs` with the eager flag set)
+            eager_input: when true does *not* try to read our input off the channel -- generally
+                this should be left alone unless you know what you are doing!
 
         Returns:
             Tuple[bytes, bytes]: tuple of "raw" output and "processed" (cleaned up/stripped) output
@@ -480,12 +492,18 @@ class Channel(BaseChannel):
         bytes_channel_input = channel_input.encode()
 
         self.logger.info(
-            f"sending channel input: {channel_input}; strip_prompt: {strip_prompt}; eager: {eager}"
+            "sending channel input: %s; strip_prompt: %s; eager: %s",
+            channel_input,
+            strip_prompt,
+            eager,
         )
 
         with self._channel_lock():
             self.write(channel_input=channel_input)
-            _buf_until_input = self._read_until_input(channel_input=bytes_channel_input)
+
+            if not eager_input:
+                _buf_until_input = self._read_until_input(channel_input=bytes_channel_input)
+
             self.send_return()
 
             if not eager:
@@ -532,8 +550,12 @@ class Channel(BaseChannel):
         ]
 
         self.logger.info(
-            f"sending channel input and read: {channel_input}; strip_prompt: {strip_prompt}; "
-            f"expected_outputs: {expected_outputs}; read_duration: {read_duration}"
+            "sending channel input and read: %s; strip_prompt: %s; "
+            "expected_outputs: %s; read_duration: %s",
+            channel_input,
+            strip_prompt,
+            expected_outputs,
+            read_duration,
         )
 
         with self._channel_lock():
@@ -643,9 +665,10 @@ class Channel(BaseChannel):
 
                 _channel_input = channel_input if not hidden_input else "REDACTED"
                 self.logger.info(
-                    f"sending interactive input: {_channel_input}; "
-                    f"expecting: {channel_response}; "
-                    f"hidden_input: {hidden_input}"
+                    "sending interactive input: %s; expecting: %s; hidden_input: %s",
+                    _channel_input,
+                    channel_response,
+                    hidden_input,
                 )
 
                 self.write(channel_input=channel_input, redacted=bool(hidden_input))

{scrapli-2023.7.30 → scrapli-2024.7.30}/scrapli/decorators.py

@@ -1,4 +1,5 @@
 """scrapli.decorators"""
+
 import asyncio
 import signal
 import sys

{scrapli-2023.7.30 → scrapli-2024.7.30}/scrapli/driver/__init__.py

@@ -1,4 +1,5 @@
 """scrapli.driver"""
+
 from scrapli.driver.base import AsyncDriver, Driver
 from scrapli.driver.generic import AsyncGenericDriver, GenericDriver
 from scrapli.driver.network import AsyncNetworkDriver, NetworkDriver

{scrapli-2023.7.30 → scrapli-2024.7.30}/scrapli/driver/base/__init__.py

@@ -1,4 +1,5 @@
 """scrapli.driver.base"""
+
 from scrapli.driver.base.async_driver import AsyncDriver
 from scrapli.driver.base.sync_driver import Driver
 

{scrapli-2023.7.30 → scrapli-2024.7.30}/scrapli/driver/base/async_driver.py

@@ -1,11 +1,12 @@
 """scrapli.driver.base.async_driver"""
+
 from types import TracebackType
 from typing import Any, Optional, Type, TypeVar
 
 from scrapli.channel import AsyncChannel
 from scrapli.driver.base.base_driver import BaseDriver
-from scrapli.exceptions import ScrapliValueError
-from scrapli.transport import ASYNCIO_TRANSPORTS
+from scrapli.exceptions import ScrapliConnectionError, ScrapliValueError
+from scrapli.transport import ASYNCIO_TRANSPORTS, CORE_TRANSPORTS
 
 _T = TypeVar("_T", bound="AsyncDriver")
 
@@ -14,7 +15,7 @@ class AsyncDriver(BaseDriver):
     def __init__(self, **kwargs: Any):
         super().__init__(**kwargs)
 
-        if self.transport_name not in ASYNCIO_TRANSPORTS:
+        if self.transport_name in CORE_TRANSPORTS and self.transport_name not in ASYNCIO_TRANSPORTS:
             raise ScrapliValueError(
                 "provided transport is *not* an asyncio transport, must use an async transport with"
                 " the AsyncDriver(s)"
@@ -39,10 +40,22 @@ class AsyncDriver(BaseDriver):
             _T: a concrete implementation of the opened AsyncDriver object
 
         Raises:
-            N/A
+            ScrapliConnectionError: if an exception occurs during opening
 
         """
-        await self.open()
+        try:
+            await self.open()
+        except Exception as exc:
+            self.logger.critical(
+                "encountered exception during open in context manager,"
+                " attempting to close transport and channel"
+            )
+
+            self.transport.close()
+            self.channel.close()
+
+            raise ScrapliConnectionError(exc) from exc
+
         return self
 
     async def __aexit__(
@@ -87,14 +100,7 @@ class AsyncDriver(BaseDriver):
         await self.transport.open()
         self.channel.open()
 
-        if (
-            self.transport_name
-            in (
-                "telnet",
-                "asynctelnet",
-            )
-            and not self.auth_bypass
-        ):
+        if "telnet" in self.transport_name and not self.auth_bypass:
             await self.channel.channel_authenticate_telnet(
                 auth_username=self.auth_username, auth_password=self.auth_password
             )