From bc2ac8b53986b4af9b4e8874e4a589a4e8eca576 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Wed, 18 Jun 2025 07:43:17 +0100 Subject: Revert "T7320: Fixed compatibility with Paramiko by removing all "null" bytes." (#422) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Revert "T7320: Fixed compatibility with Paramiko by removing all "null" bytes…" This reverts commit f02bc8b2af6de47962e3670e719d756df0cba029. * Changelog to enable the branch revert * Fixing lint --------- Co-authored-by: Om Nom Co-authored-by: Gaige B Paulsen --- changelogs/fragments/T7320-paramiko.yaml | 2 -- changelogs/fragments/revert-409-paramiko-compatible.yaml | 3 +++ plugins/cliconf/vyos.py | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 changelogs/fragments/T7320-paramiko.yaml create mode 100644 changelogs/fragments/revert-409-paramiko-compatible.yaml diff --git a/changelogs/fragments/T7320-paramiko.yaml b/changelogs/fragments/T7320-paramiko.yaml deleted file mode 100644 index fd253b65..00000000 --- a/changelogs/fragments/T7320-paramiko.yaml +++ /dev/null @@ -1,2 +0,0 @@ -bugfixes: - - Fixed compatibility with paramiko. diff --git a/changelogs/fragments/revert-409-paramiko-compatible.yaml b/changelogs/fragments/revert-409-paramiko-compatible.yaml new file mode 100644 index 00000000..658c6166 --- /dev/null +++ b/changelogs/fragments/revert-409-paramiko-compatible.yaml @@ -0,0 +1,3 @@ +--- +trivial: + - changelog to enable the branch restore diff --git a/plugins/cliconf/vyos.py b/plugins/cliconf/vyos.py index 8cbafb1d..5beffaa1 100644 --- a/plugins/cliconf/vyos.py +++ b/plugins/cliconf/vyos.py @@ -138,7 +138,6 @@ class Cliconf(CliconfBase): requests.append(cmd["command"]) out = self.get("compare") out = to_text(out, errors="surrogate_or_strict") - out = out.replace("\u0000", "") diff_config = out if not out.startswith("No changes") else None if diff_config: -- cgit v1.2.3