Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-junos-eznc for openSUSE:Factory checked in at 2026-10-06 19:17:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-junos-eznc (Old) and /work/SRC/openSUSE:Factory/.python-junos-eznc.new.3698736 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-junos-eznc" Tue Oct 6 19:17:16 2026 rev:20 rq:1382645 version:2.8.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-junos-eznc/python-junos-eznc.changes 2025-04-15 16:50:14.913960747 +0200 +++ /work/SRC/openSUSE:Factory/.python-junos-eznc.new.3698736/python-junos-eznc.changes 2026-10-06 19:17:18.830763965 +0200 @@ -1,0 +2,29 @@ +Tue Oct 6 03:33:42 UTC 2026 - Steve Kowalik <[email protected]> + +- Update to 2.8.2: + * Gather facts for the satellite devices + * Upgraded Jinja2 version 3.1.6 + * Added hostname validation before substituting the hostname in the + proxy_command + * Added support for routing instances and satellite options in + `sw.install()` + * Introduced support for the `proxy_command` parameter + * Enabled the "request vmhost zeroize" functionality + * Fixed an issue where `allow_agent` and `look_for_keys` parameters were + not being honored by `ssh_client` + * Python 3.12+ Support: Added official support for Python 3.12 and later + versions, ensuring compatibility with the latest Python ecosystems + * SSH Agent Support: Added the allow_agent parameter support + to improve flexible authentication workflows + * Dependency Update: Migrated from yamlordereddictloader + to yamlloader for improved YAML processing + * Support for ncclient 0.7.0 +- Drop patches: + * python-junos-eznc-remove-yamlordereddictloader.patch + * get-telnetlib-from-netmiko.patch +- Add patches: + * no-more-pkg-resources.patch + * ntc-templates-9.3-compat.patch +* Refreshed no-six.patch + +------------------------------------------------------------------- Old: ---- get-telnetlib-from-netmiko.patch python-junos-eznc-2.7.2.tar.gz python-junos-eznc-remove-yamlordereddictloader.patch New: ---- no-more-pkg-resources.patch ntc-templates-9.3-compat.patch python-junos-eznc-2.8.2.tar.gz ----------(Old B)---------- Old: * python-junos-eznc-remove-yamlordereddictloader.patch * get-telnetlib-from-netmiko.patch - Add patches: Old:- Drop patches: * python-junos-eznc-remove-yamlordereddictloader.patch * get-telnetlib-from-netmiko.patch ----------(Old E)---------- ----------(New B)---------- New:- Add patches: * no-more-pkg-resources.patch * ntc-templates-9.3-compat.patch New: * no-more-pkg-resources.patch * ntc-templates-9.3-compat.patch * Refreshed no-six.patch ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-junos-eznc.spec ++++++ --- /var/tmp/diff_new_pack.lXM5ig/_old 2026-10-06 19:17:19.959811211 +0200 +++ /var/tmp/diff_new_pack.lXM5ig/_new 2026-10-06 19:17:19.961811295 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-junos-eznc # -# Copyright (c) 2025 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # Copyright (c) 2017-2020, Martin Hauke <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -19,24 +19,21 @@ %{?sle15_python_module_pythons} Name: python-junos-eznc -Version: 2.7.2 +Version: 2.8.2 Release: 0 Summary: Junos 'EZ' automation for non-programmers License: Apache-2.0 URL: https://www.github.com/Juniper/py-junos-eznc Source: https://github.com/Juniper/py-junos-eznc/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -# replace deprecated yamlordereddictloader by yamlloader -# https://github.com/Juniper/py-junos-eznc/pull/1078 -Patch0: python-junos-eznc-remove-yamlordereddictloader.patch # PATCH-FIX-UPSTREAM gh#Juniper/py-junos-eznc#1307 Don't require six -Patch1: no-six.patch -# PATCH-FIX-UPSTREAM gh#Juniper/py-junos-eznc#1324 telnetlib not in py313 anymore -Patch2: get-telnetlib-from-netmiko.patch +Patch0: no-six.patch +Patch1: no-more-pkg-resources.patch +Patch2: ntc-templates-9.3-compat.patch BuildRequires: %{python_module Jinja2 >= 2.7.1} BuildRequires: %{python_module PyYAML >= 5.1} +BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module lxml >= 3.2.4} -BuildRequires: %{python_module ncclient >= 0.6.15} -BuildRequires: %{python_module netmiko >= 4.4.0} +BuildRequires: %{python_module ncclient >= 0.7.0} BuildRequires: %{python_module nose2} BuildRequires: %{python_module ntc-templates} BuildRequires: %{python_module paramiko >= 1.15.2} @@ -53,13 +50,13 @@ Requires: python-Jinja2 >= 2.7.1 Requires: python-PyYAML >= 5.1 Requires: python-lxml >= 3.2.4 -Requires: python-ncclient >= 0.6.15 -Requires: python-netmiko >= 4.4.0 +Requires: python-ncclient >= 0.7.0 Requires: python-paramiko >= 1.15.2 Requires: python-pyparsing Requires: python-pyserial Requires: python-scp >= 0.7.0 Requires: python-transitions +Requires: python-yamlloader BuildArch: noarch %python_subpackages @@ -92,8 +89,6 @@ %files %{python_files} %license COPYRIGHT LICENSE %doc README.txt README.md -%dir %{python_sitelib}/jnpr -%{python_sitelib}/jnpr/junos +%{python_sitelib}/jnpr %{python_sitelib}/junos_eznc-%{version}.dist-info -%{python_sitelib}/junos_eznc-%{version}*-nspkg.pth ++++++ no-more-pkg-resources.patch ++++++ Index: py-junos-eznc-2.8.2/lib/jnpr/__init__.py =================================================================== --- py-junos-eznc-2.8.2.orig/lib/jnpr/__init__.py +++ py-junos-eznc-2.8.2/lib/jnpr/__init__.py @@ -1 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__) Index: py-junos-eznc-2.8.2/setup.py =================================================================== --- py-junos-eznc-2.8.2.orig/setup.py +++ py-junos-eznc-2.8.2/setup.py @@ -10,7 +10,6 @@ install_reqs = list(filter(None, req_lin setup( name="junos-eznc", - namespace_packages=["jnpr"], version=versioneer.get_version(), cmdclass=versioneer.get_cmdclass(), author="Jeremy Schulman, Nitin Kumar, Rick Sherman, Stacy Smith", ++++++ no-six.patch ++++++ --- /var/tmp/diff_new_pack.lXM5ig/_old 2026-10-06 19:17:19.990812508 +0200 +++ /var/tmp/diff_new_pack.lXM5ig/_new 2026-10-06 19:17:19.993812634 +0200 @@ -1,15 +1,12 @@ -Index: py-junos-eznc-2.7.2/lib/jnpr/junos/jxml.py +Index: py-junos-eznc-2.8.2/lib/jnpr/junos/jxml.py =================================================================== ---- py-junos-eznc-2.7.2.orig/lib/jnpr/junos/jxml.py -+++ py-junos-eznc-2.7.2/lib/jnpr/junos/jxml.py -@@ -1,7 +1,6 @@ +--- py-junos-eznc-2.8.2.orig/lib/jnpr/junos/jxml.py ++++ py-junos-eznc-2.8.2/lib/jnpr/junos/jxml.py +@@ -1,4 +1,3 @@ +-import six + from lxml import etree from ncclient import manager from ncclient.xml_ import NCElement - from lxml import etree --import six - - """ - These are Junos XML 'helper' definitions use for generic XML processing @@ -226,8 +225,7 @@ def cscript_conf(reply): @@ -25,16 +22,19 @@ </xsl:template> </xsl:stylesheet>""" -) -Index: py-junos-eznc-2.7.2/lib/jnpr/junos/transport/tty_netconf.py +Index: py-junos-eznc-2.8.2/lib/jnpr/junos/transport/tty_netconf.py =================================================================== ---- py-junos-eznc-2.7.2.orig/lib/jnpr/junos/transport/tty_netconf.py -+++ py-junos-eznc-2.7.2/lib/jnpr/junos/transport/tty_netconf.py -@@ -11,23 +11,22 @@ from lxml.etree import XMLSyntaxError +--- py-junos-eznc-2.8.2.orig/lib/jnpr/junos/transport/tty_netconf.py ++++ py-junos-eznc-2.8.2/lib/jnpr/junos/transport/tty_netconf.py +@@ -6,7 +6,6 @@ import sys + import time from datetime import datetime, timedelta - from ncclient.operations.rpc import RPCReply, RPCError - from ncclient.xml_ import to_ele + -import six - from ncclient.transport.session import HelloHandler + from lxml import etree + from lxml.builder import E + from lxml.etree import XMLSyntaxError +@@ -16,18 +15,18 @@ from ncclient.xml_ import to_ele class PY6: @@ -64,24 +64,24 @@ """ if not cmd.startswith("<"): cmd = "<{}/>".format(cmd) -- rpc = six.b("<rpc>{}</rpc>".format(cmd)) -+ rpc = "<rpc>{}</rpc>".format(cmd).encode('utf-8') - logger.info("Calling rpc: %s" % rpc) - self._tty.rawwrite(rpc) +- rpc_bytes = six.b("<rpc>{}</rpc>".format(cmd)) ++ rpc_bytes = "<rpc>{}</rpc>".format(cmd).encode("utf-8") + logger.info("Calling rpc: %s", rpc_bytes.decode("utf-8", "replace")) + self._tty.rawwrite(rpc_bytes) -Index: py-junos-eznc-2.7.2/lib/jnpr/junos/transport/tty_ssh.py +Index: py-junos-eznc-2.8.2/lib/jnpr/junos/transport/tty_ssh.py =================================================================== ---- py-junos-eznc-2.7.2.orig/lib/jnpr/junos/transport/tty_ssh.py -+++ py-junos-eznc-2.7.2/lib/jnpr/junos/transport/tty_ssh.py +--- py-junos-eznc-2.8.2.orig/lib/jnpr/junos/transport/tty_ssh.py ++++ py-junos-eznc-2.8.2/lib/jnpr/junos/transport/tty_ssh.py @@ -6,7 +6,6 @@ import sys from time import sleep, time import paramiko -import six - from jnpr.junos.transport.tty import Terminal -@@ -15,14 +14,14 @@ logger = logging.getLogger("jnpr.junos.t + logger = logging.getLogger("jnpr.junos.tty_ssh") +@@ -14,14 +13,14 @@ logger = logging.getLogger("jnpr.junos.t # ------------------------------------------------------------------------- # Terminal connection over SSH CONSOLE # ------------------------------------------------------------------------- @@ -101,7 +101,7 @@ class SSH(Terminal): -@@ -136,7 +135,7 @@ class SSH(Terminal): +@@ -135,7 +134,7 @@ class SSH(Terminal): def write(self, content): """write content + <ENTER>""" logger.debug("Write: %s" % content) @@ -110,7 +110,7 @@ def rawwrite(self, content): """write content as-is""" -@@ -152,13 +151,13 @@ class SSH(Terminal): +@@ -151,13 +150,13 @@ class SSH(Terminal): if sys.version >= "3": content = content.decode("utf-8") for char in content: @@ -126,7 +126,7 @@ while True: data = self._ssh.recv(self.RECVSZ) if data is None or len(data) <= 0: -@@ -180,7 +179,7 @@ class SSH(Terminal): +@@ -179,7 +178,7 @@ class SSH(Terminal): regular-expression group. If a timeout occurs, then return the tuple(None,None). """ @@ -135,7 +135,7 @@ timeout = time() + self.READ_PROMPT_DELAY while time() < timeout: -@@ -199,7 +198,7 @@ class SSH(Terminal): +@@ -198,7 +197,7 @@ class SSH(Terminal): return rxb, found.lastgroup def _read_until(self, match, timeout=None): @@ -144,19 +144,11 @@ timeout = time() + self.READ_PROMPT_DELAY while time() < timeout: -Index: py-junos-eznc-2.7.2/lib/jnpr/junos/transport/tty_telnet.py +Index: py-junos-eznc-2.8.2/lib/jnpr/junos/transport/tty_telnet.py =================================================================== ---- py-junos-eznc-2.7.2.orig/lib/jnpr/junos/transport/tty_telnet.py -+++ py-junos-eznc-2.7.2/lib/jnpr/junos/transport/tty_telnet.py -@@ -2,7 +2,6 @@ from time import sleep - import telnetlib - import logging - import sys --import six - - from jnpr.junos.transport.tty import Terminal - -@@ -14,10 +13,10 @@ logger = logging.getLogger("jnpr.junos.t +--- py-junos-eznc-2.8.2.orig/lib/jnpr/junos/transport/tty_telnet.py ++++ py-junos-eznc-2.8.2/lib/jnpr/junos/transport/tty_telnet.py +@@ -14,10 +14,10 @@ logger = logging.getLogger("jnpr.junos.t class PY6: @@ -171,7 +163,7 @@ class Telnet(Terminal): -@@ -81,7 +80,7 @@ class Telnet(Terminal): +@@ -81,7 +81,7 @@ class Telnet(Terminal): def write(self, content): """write content + <ENTER>""" logger.debug("Write: %s" % content) @@ -180,7 +172,7 @@ def rawwrite(self, content): """write content as-is""" -@@ -97,7 +96,7 @@ class Telnet(Terminal): +@@ -97,7 +97,7 @@ class Telnet(Terminal): if sys.version >= "3": content = content.decode("utf-8") for char in content: @@ -189,7 +181,7 @@ wtime = 10 / float(self.baud) sleep(wtime) # do not remove -@@ -106,7 +105,7 @@ class Telnet(Terminal): +@@ -106,7 +106,7 @@ class Telnet(Terminal): return self._tn.read_until(PY6.NEW_LINE, self.EXPECT_TIMEOUT) def read_prompt(self): @@ -198,18 +190,18 @@ got = self._tn.expect(_RE_PAT, self.EXPECT_TIMEOUT) if PY6.IN_USE in got[2]: raise RuntimeError("open_fail: port already in use") -Index: py-junos-eznc-2.7.2/lib/jnpr/junos/transport/tty_serial.py +Index: py-junos-eznc-2.8.2/lib/jnpr/junos/transport/tty_serial.py =================================================================== ---- py-junos-eznc-2.7.2.orig/lib/jnpr/junos/transport/tty_serial.py -+++ py-junos-eznc-2.7.2/lib/jnpr/junos/transport/tty_serial.py -@@ -1,6 +1,5 @@ +--- py-junos-eznc-2.8.2.orig/lib/jnpr/junos/transport/tty_serial.py ++++ py-junos-eznc-2.8.2/lib/jnpr/junos/transport/tty_serial.py +@@ -3,14 +3,13 @@ from datetime import datetime, timedelta + from time import sleep + import serial - import re -import six - from time import sleep - from datetime import datetime, timedelta + from jnpr.junos.transport.tty import Terminal -@@ -10,7 +9,7 @@ from jnpr.junos.transport.tty import Ter + # ------------------------------------------------------------------------- # Terminal connection over SERIAL CONSOLE # ------------------------------------------------------------------------- @@ -236,19 +228,30 @@ mark_start = datetime.now() mark_end = mark_start + timedelta(seconds=self.EXPECT_TIMEOUT) -Index: py-junos-eznc-2.7.2/tests/unit/test_console.py +Index: py-junos-eznc-2.8.2/tests/unit/test_console.py =================================================================== ---- py-junos-eznc-2.7.2.orig/tests/unit/test_console.py -+++ py-junos-eznc-2.7.2/tests/unit/test_console.py -@@ -9,7 +9,6 @@ import re - import sys - import os - from lxml import etree --import six - import socket +--- py-junos-eznc-2.8.2.orig/tests/unit/test_console.py ++++ py-junos-eznc-2.8.2/tests/unit/test_console.py +@@ -10,18 +10,12 @@ import sys + from unittest.mock import MagicMock, call, patch + import nose2 +-import six from jnpr.junos.console import Console -@@ -40,16 +39,16 @@ class TestConsole(unittest.TestCase): + from jnpr.junos.transport.tty_netconf import tty_netconf + from jnpr.junos.transport.tty_telnet import Terminal + from jnpr.junos.utils.config import Config + from lxml import etree + +-if sys.version < "3": +- builtin_string = "__builtin__" +-else: +- builtin_string = "builtins" +- + + class TestConsole(unittest.TestCase): + @classmethod +@@ -40,16 +34,16 @@ class TestConsole(unittest.TestCase): def setUp(self, mock_write, mock_expect, mock_open): tty_netconf.open = MagicMock() mock_expect.side_effect = [ @@ -268,7 +271,7 @@ ), ] self.dev = Console(host="1.1.1.1", user="lab", password="lab123", mode="Telnet") -@@ -87,16 +86,16 @@ class TestConsole(unittest.TestCase): +@@ -87,16 +81,16 @@ class TestConsole(unittest.TestCase): def test_login_bad_password(self, mock_write, mock_expect, mock_open): tty_netconf.open = MagicMock() mock_expect.side_effect = [ @@ -288,7 +291,7 @@ ), ] self.dev = Console(host="1.1.1.1", user="lab", password="lab123", mode="Telnet") -@@ -110,16 +109,16 @@ class TestConsole(unittest.TestCase): +@@ -110,16 +104,16 @@ class TestConsole(unittest.TestCase): tty_netconf.open = MagicMock() mock_expect.side_effect = [ @@ -308,7 +311,7 @@ ), ] with Console( -@@ -175,9 +174,9 @@ class TestConsole(unittest.TestCase): +@@ -175,9 +169,9 @@ class TestConsole(unittest.TestCase): def test_console_serial(self, mock_write, mock_expect, mock_open): tty_netconf.open = MagicMock() mock_expect.side_effect = [ @@ -321,7 +324,7 @@ ] self.dev = Console(host="1.1.1.1", user="lab", password="lab123", mode="serial") self.dev.open() -@@ -258,15 +257,13 @@ class TestConsole(unittest.TestCase): +@@ -260,15 +254,13 @@ class TestConsole(unittest.TestCase): </policy-statement> </policy-options>""" @@ -338,19 +341,19 @@ cu = Config(self.dev) op = cu.load(xml, format="xml") cu.commit() -Index: py-junos-eznc-2.7.2/tests/unit/transport/test_serial.py +Index: py-junos-eznc-2.8.2/tests/unit/transport/test_serial.py =================================================================== ---- py-junos-eznc-2.7.2.orig/tests/unit/transport/test_serial.py -+++ py-junos-eznc-2.7.2/tests/unit/transport/test_serial.py -@@ -5,7 +5,6 @@ except ImportError: - import nose2 +--- py-junos-eznc-2.8.2.orig/tests/unit/transport/test_serial.py ++++ py-junos-eznc-2.8.2/tests/unit/transport/test_serial.py +@@ -7,7 +7,6 @@ import sys from unittest.mock import MagicMock, patch - import sys --import six + import nose2 +-import six from jnpr.junos.console import Console -@@ -90,12 +89,9 @@ class TestSerialWin(unittest.TestCase): + if sys.version < "3": +@@ -91,12 +90,9 @@ class TestSerialWin(unittest.TestCase): ("shell", "shell"), ] mock_serial_read.side_effect = [ @@ -366,7 +369,7 @@ <hello xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"> <capabilities> <capability>urn:ietf:params:netconf:base:1.0</capability> -@@ -114,9 +110,8 @@ class TestSerialWin(unittest.TestCase): +@@ -115,9 +111,8 @@ class TestSerialWin(unittest.TestCase): </capabilities> <session-id>7478</session-id> </hello> @@ -378,7 +381,7 @@ ] self.dev.open() -@@ -144,7 +139,7 @@ class TestSerialWin(unittest.TestCase): +@@ -145,7 +140,7 @@ class TestSerialWin(unittest.TestCase): self.dev._tty.read = MagicMock() self.dev._tty.rawwrite = MagicMock() self.dev._tty.read.side_effect = [ @@ -387,7 +390,7 @@ '<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"' ' xmlns:junos="http://xml.juniper.net/junos/15.1X49/junos";>' '<route-engine-information xmlns="http://xml.juniper.net/ju' -@@ -170,7 +165,8 @@ class TestSerialWin(unittest.TestCase): +@@ -171,7 +166,8 @@ class TestSerialWin(unittest.TestCase): "-reason><load-average-one>0.12</load-average-one><load-ave" "rage-five>0.08</load-average-five><load-average-fifteen>0." "06</load-average-fifteen></route-engine></route-engine-inf" @@ -397,18 +400,18 @@ ) ] res = self.dev.rpc.get_route_engine_information() -Index: py-junos-eznc-2.7.2/tests/unit/transport/test_tty_netconf.py +Index: py-junos-eznc-2.8.2/tests/unit/transport/test_tty_netconf.py =================================================================== ---- py-junos-eznc-2.7.2.orig/tests/unit/transport/test_tty_netconf.py -+++ py-junos-eznc-2.7.2/tests/unit/transport/test_tty_netconf.py -@@ -7,7 +7,6 @@ from unittest.mock import MagicMock, pat +--- py-junos-eznc-2.8.2.orig/tests/unit/transport/test_tty_netconf.py ++++ py-junos-eznc-2.8.2/tests/unit/transport/test_tty_netconf.py +@@ -9,7 +9,6 @@ import socket + from unittest.mock import MagicMock, patch + import nose2 +-import six from jnpr.junos.transport.tty_netconf import tty_netconf + from ncclient.operations import RPCError --import six - import os - import select - import socket @@ -43,7 +42,7 @@ class TestTTYNetconf(unittest.TestCase): @patch("jnpr.junos.transport.tty_netconf.timedelta") def test_open_RuntimeError(self, mock_delta, mock_rcv): @@ -483,19 +486,19 @@ ] ) mock_select.return_value = ([rx], [], []) -Index: py-junos-eznc-2.7.2/tests/unit/transport/test_tty_telnet.py +Index: py-junos-eznc-2.8.2/tests/unit/transport/test_tty_telnet.py =================================================================== ---- py-junos-eznc-2.7.2.orig/tests/unit/transport/test_tty_telnet.py -+++ py-junos-eznc-2.7.2/tests/unit/transport/test_tty_telnet.py -@@ -7,7 +7,6 @@ except ImportError: - import nose2 +--- py-junos-eznc-2.8.2.orig/tests/unit/transport/test_tty_telnet.py ++++ py-junos-eznc-2.8.2/tests/unit/transport/test_tty_telnet.py +@@ -8,7 +8,6 @@ except ImportError: from unittest.mock import MagicMock, patch - from jnpr.junos.transport.tty_telnet import Telnet + + import nose2 -import six + from jnpr.junos.transport.tty_telnet import Telnet - class TestTTYTelnet(unittest.TestCase): -@@ -62,7 +61,7 @@ class TestTTYTelnet(unittest.TestCase): +@@ -64,7 +63,7 @@ class TestTTYTelnet(unittest.TestCase): self.tel_conn._tn.expect.return_value = ( None, None, @@ -504,18 +507,19 @@ ) self.assertRaises(RuntimeError, self.tel_conn._login_state_machine) -Index: py-junos-eznc-2.7.2/lib/jnpr/junos/device.py +Index: py-junos-eznc-2.8.2/lib/jnpr/junos/device.py =================================================================== ---- py-junos-eznc-2.7.2.orig/lib/jnpr/junos/device.py -+++ py-junos-eznc-2.7.2/lib/jnpr/junos/device.py -@@ -1,6 +1,5 @@ - # stdlib - import os +--- py-junos-eznc-2.8.2.orig/lib/jnpr/junos/device.py ++++ py-junos-eznc-2.8.2/lib/jnpr/junos/device.py +@@ -18,7 +18,6 @@ import jinja2 + import ncclient.operations.errors as NcOpErrors + import ncclient.transport.errors as NcErrors + import paramiko -import six - import types - import platform - import warnings -@@ -659,7 +658,7 @@ class _Connection(object): + from jnpr.junos import exception as EzErrors + from jnpr.junos import jxml as JXML + from jnpr.junos.decorators import ( +@@ -665,7 +664,7 @@ class _Connection(object): command = command.strip() # Get the equivalent RPC rpc = self.display_xml_rpc(command) @@ -524,34 +528,34 @@ # No RPC is available. return None rpc_string = "rpc.%s(" % (rpc.tag.replace("-", "_")) -Index: py-junos-eznc-2.7.2/lib/jnpr/junos/utils/start_shell.py +Index: py-junos-eznc-2.8.2/lib/jnpr/junos/utils/start_shell.py =================================================================== ---- py-junos-eznc-2.7.2.orig/lib/jnpr/junos/utils/start_shell.py -+++ py-junos-eznc-2.7.2/lib/jnpr/junos/utils/start_shell.py -@@ -3,7 +3,6 @@ import re - import datetime - from jnpr.junos.utils.ssh_client import open_ssh_client - import subprocess --import six +--- py-junos-eznc-2.8.2.orig/lib/jnpr/junos/utils/start_shell.py ++++ py-junos-eznc-2.8.2/lib/jnpr/junos/utils/start_shell.py +@@ -5,7 +5,6 @@ import time + from select import select from threading import Thread - import time -Index: py-junos-eznc-2.7.2/requirements.txt +-import six + from jnpr.junos.utils.ssh_client import open_ssh_client + + _JUNOS_PROMPT = "> " +Index: py-junos-eznc-2.8.2/requirements.txt =================================================================== ---- py-junos-eznc-2.7.2.orig/requirements.txt -+++ py-junos-eznc-2.7.2/requirements.txt +--- py-junos-eznc-2.8.2.orig/requirements.txt ++++ py-junos-eznc-2.8.2/requirements.txt @@ -5,7 +5,6 @@ scp>=0.7.0 - jinja2>=2.7.1 + jinja2>=3.1.6 PyYAML>=5.1 paramiko>=3.5.0 -six pyserial + yamlloader pyparsing - transitions -Index: py-junos-eznc-2.7.2/tests/unit/facts/test_swver.py +Index: py-junos-eznc-2.8.2/tests/unit/facts/test_swver.py =================================================================== ---- py-junos-eznc-2.7.2.orig/tests/unit/facts/test_swver.py -+++ py-junos-eznc-2.7.2/tests/unit/facts/test_swver.py +--- py-junos-eznc-2.8.2.orig/tests/unit/facts/test_swver.py ++++ py-junos-eznc-2.8.2/tests/unit/facts/test_swver.py @@ -1,8 +1,6 @@ __author__ = "Stacy Smith" __credits__ = "Jeremy Schulman, Nitin Kumar" @@ -561,7 +565,7 @@ try: import unittest2 as unittest except: -@@ -13,9 +11,6 @@ from jnpr.junos.facts.swver import versi +@@ -13,9 +11,6 @@ from jnpr.junos.facts.swver import get_f class TestVersionInfo(unittest.TestCase): @@ -571,25 +575,33 @@ def test_version_info_after_type_len_else(self): self.assertEqual(version_info("12.1X46-D10").build, None) -Index: py-junos-eznc-2.7.2/tests/unit/utils/test_scp.py +Index: py-junos-eznc-2.8.2/tests/unit/utils/test_scp.py =================================================================== ---- py-junos-eznc-2.7.2.orig/tests/unit/utils/test_scp.py -+++ py-junos-eznc-2.7.2/tests/unit/utils/test_scp.py -@@ -1,5 +1,5 @@ +--- py-junos-eznc-2.8.2.orig/tests/unit/utils/test_scp.py ++++ py-junos-eznc-2.8.2/tests/unit/utils/test_scp.py +@@ -1,12 +1,12 @@ import sys --from six import StringIO -+from io import StringIO + import unittest from contextlib import contextmanager ++from io import StringIO + from unittest.mock import patch + + import nose2 + from jnpr.junos import Device + from jnpr.junos.utils.scp import SCP +-from six import StringIO + + __author__ = "Rick Sherman, Nitin Kumar" + __credits__ = "Jeremy Schulman" +Index: py-junos-eznc-2.8.2/tests/unit/utils/test_sw.py +=================================================================== +--- py-junos-eznc-2.8.2.orig/tests/unit/utils/test_sw.py ++++ py-junos-eznc-2.8.2/tests/unit/utils/test_sw.py +@@ -2,8 +2,7 @@ from __future__ import print_function - import unittest -Index: py-junos-eznc-2.7.2/tests/unit/utils/test_sw.py -=================================================================== ---- py-junos-eznc-2.7.2.orig/tests/unit/utils/test_sw.py -+++ py-junos-eznc-2.7.2/tests/unit/utils/test_sw.py -@@ -1,7 +1,7 @@ - from __future__ import print_function import os import sys +- -from six import StringIO +from io import StringIO ++++++ ntc-templates-9.3-compat.patch ++++++ Index: py-junos-eznc-2.8.2/tests/unit/factory/test_cmdtable.py =================================================================== --- py-junos-eznc-2.8.2.orig/tests/unit/factory/test_cmdtable.py +++ py-junos-eznc-2.8.2/tests/unit/factory/test_cmdtable.py @@ -2310,7 +2310,7 @@ ARPtable: ARPview: fields: - mac: MAC + mac: MAC_ADDRESS ip: IP_ADDRESS interface: INTERFACE flag: FLAGS ++++++ python-junos-eznc-2.7.2.tar.gz -> python-junos-eznc-2.8.2.tar.gz ++++++ ++++ 9112 lines of diff (skipped)
