Accepting request 1269576 from devel:languages:python

OBS-URL: https://build.opensuse.org/request/show/1269576 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-junos-eznc?expand=0&rev=19
Accepting request 1269534 from home:crameleon:branches:devel:languages:python
2025-04-15 14:47:59 +00:00 · 2025-04-15 10:20:32 +00:00 · 2024-11-27 21:12:49 +00:00 · 2024-11-27 10:15:06 +00:00 · 2024-10-28 14:20:57 +00:00 · 2024-10-28 05:41:43 +00:00
9 changed files with 167 additions and 736 deletions
--- a/get-telnetlib-from-netmiko.patch
+++ b/get-telnetlib-from-netmiko.patch
@@ -0,0 +1,23 @@
+Index: py-junos-eznc-2.7.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
+@@ -1,5 +1,5 @@
+ from time import sleep
+-import telnetlib
+from netmiko._telnetlib import telnetlib
+ import logging
+ import sys
+ 
+Index: py-junos-eznc-2.7.2/requirements.txt
+===================================================================
+--- py-junos-eznc-2.7.2.orig/requirements.txt
+++ py-junos-eznc-2.7.2/requirements.txt
+@@ -5,6 +5,7 @@ scp>=0.7.0
+ jinja2>=2.7.1
+ PyYAML>=5.1
+ paramiko>=3.5.0
+netmiko>=4.4.0
+ pyserial
+ pyparsing
+ transitions
--- a/no-six.patch
+++ b/no-six.patch
@@ -1,7 +1,7 @@
-Index: py-junos-eznc-2.7.1/lib/jnpr/junos/jxml.py
+Index: py-junos-eznc-2.7.2/lib/jnpr/junos/jxml.py
 ===================================================================
--- py-junos-eznc-2.7.1.orig/lib/jnpr/junos/jxml.py
-+++ py-junos-eznc-2.7.1/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 @@
 from ncclient import manager
 from ncclient.xml_ import NCElement
@@ -25,10 +25,10 @@ Index: py-junos-eznc-2.7.1/lib/jnpr/junos/jxml.py
     </xsl:template>
 </xsl:stylesheet>"""
 -)
-Index: py-junos-eznc-2.7.1/lib/jnpr/junos/transport/tty_netconf.py
+Index: py-junos-eznc-2.7.2/lib/jnpr/junos/transport/tty_netconf.py
 ===================================================================
--- py-junos-eznc-2.7.1.orig/lib/jnpr/junos/transport/tty_netconf.py
-+++ py-junos-eznc-2.7.1/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
 from datetime import datetime, timedelta
 from ncclient.operations.rpc import RPCReply, RPCError
@@ -60,7 +60,7 @@ Index: py-junos-eznc-2.7.1/lib/jnpr/junos/transport/tty_netconf.py
 _junosns_strip = lambda text: _junosns.sub(PY6.EMPTY_STR, text)
 
 logger = logging.getLogger("jnpr.junos.tty_netconf")
-@@ -116,7 +115,7 @@ class tty_netconf(object):
+@@ -118,7 +117,7 @@ class tty_netconf(object):
         """
         if not cmd.startswith("<"):
             cmd = "<{}/>".format(cmd)
@@ -69,10 +69,10 @@ Index: py-junos-eznc-2.7.1/lib/jnpr/junos/transport/tty_netconf.py
         logger.info("Calling rpc: %s" % rpc)
         self._tty.rawwrite(rpc)
 
-Index: py-junos-eznc-2.7.1/lib/jnpr/junos/transport/tty_ssh.py
+Index: py-junos-eznc-2.7.2/lib/jnpr/junos/transport/tty_ssh.py
 ===================================================================
--- py-junos-eznc-2.7.1.orig/lib/jnpr/junos/transport/tty_ssh.py
-+++ py-junos-eznc-2.7.1/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
@@ -6,7 +6,6 @@ import sys
 from time import sleep, time
 
@@ -144,10 +144,10 @@ Index: py-junos-eznc-2.7.1/lib/jnpr/junos/transport/tty_ssh.py
         timeout = time() + self.READ_PROMPT_DELAY
 
         while time() < timeout:
-Index: py-junos-eznc-2.7.1/lib/jnpr/junos/transport/tty_telnet.py
+Index: py-junos-eznc-2.7.2/lib/jnpr/junos/transport/tty_telnet.py
 ===================================================================
--- py-junos-eznc-2.7.1.orig/lib/jnpr/junos/transport/tty_telnet.py
-+++ py-junos-eznc-2.7.1/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
@@ -198,10 +198,10 @@ Index: py-junos-eznc-2.7.1/lib/jnpr/junos/transport/tty_telnet.py
         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.1/lib/jnpr/junos/transport/tty_serial.py
+Index: py-junos-eznc-2.7.2/lib/jnpr/junos/transport/tty_serial.py
 ===================================================================
--- py-junos-eznc-2.7.1.orig/lib/jnpr/junos/transport/tty_serial.py
-+++ py-junos-eznc-2.7.1/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 @@
 import serial
 import re
@@ -236,10 +236,10 @@ Index: py-junos-eznc-2.7.1/lib/jnpr/junos/transport/tty_serial.py
         mark_start = datetime.now()
         mark_end = mark_start + timedelta(seconds=self.EXPECT_TIMEOUT)
 
-Index: py-junos-eznc-2.7.1/tests/unit/test_console.py
+Index: py-junos-eznc-2.7.2/tests/unit/test_console.py
 ===================================================================
--- py-junos-eznc-2.7.1.orig/tests/unit/test_console.py
-+++ py-junos-eznc-2.7.1/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
@@ -252,17 +252,17 @@ Index: py-junos-eznc-2.7.1/tests/unit/test_console.py
     def setUp(self, mock_write, mock_expect, mock_open):
         tty_netconf.open = MagicMock()
         mock_expect.side_effect = [
-            (1, re.search("(?P<login>ogin:\s*$)", "login: "), six.b("\r\r\n ogin:")),
-+            (1, re.search("(?P<login>ogin:\s*$)", "login: "), b"\r\r\n ogin:"),
+-            (1, re.search(r"(?P<login>ogin:\s*$)", "login: "), six.b("\r\r\n ogin:")),
+            (1, re.search(r"(?P<login>ogin:\s*$)", "login: "), b"\r\r\n ogin:"),
             (
                 2,
-                 re.search("(?P<passwd>assword:\s*$)", "password: "),
+                 re.search(r"(?P<passwd>assword:\s*$)", "password: "),
 -                six.b("\r\r\n password:"),
 +                b"\r\r\n password:",
             ),
             (
                 3,
-                 re.search("(?P<shell>%|#\s*$)", "junos % "),
+                 re.search(r"(?P<shell>%|#\s*$)", "junos % "),
 -                six.b("\r\r\nroot@device:~ # "),
 +                b"\r\r\nroot@device:~ # ",
             ),
@@ -272,11 +272,11 @@ Index: py-junos-eznc-2.7.1/tests/unit/test_console.py
     def test_login_bad_password(self, mock_write, mock_expect, mock_open):
         tty_netconf.open = MagicMock()
         mock_expect.side_effect = [
-            (1, re.search("(?P<login>ogin:\s*$)", "login: "), six.b("\r\r\n ogin:")),
-+            (1, re.search("(?P<login>ogin:\s*$)", "login: "), b"\r\r\n ogin:"),
+-            (1, re.search(r"(?P<login>ogin:\s*$)", "login: "), six.b("\r\r\n ogin:")),
+            (1, re.search(r"(?P<login>ogin:\s*$)", "login: "), b"\r\r\n ogin:"),
             (
                 2,
-                 re.search("(?P<passwd>assword:\s*$)", "password: "),
+                 re.search(r"(?P<passwd>assword:\s*$)", "password: "),
 -                six.b("\r\r\n password:"),
 +                b"\r\r\n password:",
             ),
@@ -292,17 +292,17 @@ Index: py-junos-eznc-2.7.1/tests/unit/test_console.py
         tty_netconf.open = MagicMock()
 
         mock_expect.side_effect = [
-            (1, re.search("(?P<login>ogin:\s*$)", "login: "), six.b("\r\r\n ogin:")),
-+            (1, re.search("(?P<login>ogin:\s*$)", "login: "), b"\r\r\n ogin:"),
+-            (1, re.search(r"(?P<login>ogin:\s*$)", "login: "), six.b("\r\r\n ogin:")),
+            (1, re.search(r"(?P<login>ogin:\s*$)", "login: "), b"\r\r\n ogin:"),
             (
                 2,
-                 re.search("(?P<passwd>assword:\s*$)", "password: "),
+                 re.search(r"(?P<passwd>assword:\s*$)", "password: "),
 -                six.b("\r\r\n password:"),
 +                b"\r\r\n password:",
             ),
             (
                 3,
-                 re.search("(?P<shell>%|#\s*$)", "junos % "),
+                 re.search(r"(?P<shell>%|#\s*$)", "junos % "),
 -                six.b("\r\r\nroot@device:~ # "),
 +                b"\r\r\nroot@device:~ # ",
             ),
@@ -338,10 +338,10 @@ Index: py-junos-eznc-2.7.1/tests/unit/test_console.py
         cu = Config(self.dev)
         op = cu.load(xml, format="xml")
         cu.commit()
-Index: py-junos-eznc-2.7.1/tests/unit/transport/test_serial.py
+Index: py-junos-eznc-2.7.2/tests/unit/transport/test_serial.py
 ===================================================================
--- py-junos-eznc-2.7.1.orig/tests/unit/transport/test_serial.py
-+++ py-junos-eznc-2.7.1/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
 from unittest.mock import MagicMock, patch
@@ -397,10 +397,10 @@ Index: py-junos-eznc-2.7.1/tests/unit/transport/test_serial.py
             )
         ]
         res = self.dev.rpc.get_route_engine_information()
-Index: py-junos-eznc-2.7.1/tests/unit/transport/test_tty_netconf.py
+Index: py-junos-eznc-2.7.2/tests/unit/transport/test_tty_netconf.py
 ===================================================================
--- py-junos-eznc-2.7.1.orig/tests/unit/transport/test_tty_netconf.py
-+++ py-junos-eznc-2.7.1/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
 
 from jnpr.junos.transport.tty_netconf import tty_netconf
@@ -483,10 +483,10 @@ Index: py-junos-eznc-2.7.1/tests/unit/transport/test_tty_netconf.py
             ]
         )
         mock_select.return_value = ([rx], [], [])
-Index: py-junos-eznc-2.7.1/tests/unit/transport/test_tty_telnet.py
+Index: py-junos-eznc-2.7.2/tests/unit/transport/test_tty_telnet.py
 ===================================================================
--- py-junos-eznc-2.7.1.orig/tests/unit/transport/test_tty_telnet.py
-+++ py-junos-eznc-2.7.1/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
 from unittest.mock import MagicMock, patch
@@ -504,10 +504,10 @@ Index: py-junos-eznc-2.7.1/tests/unit/transport/test_tty_telnet.py
         )
         self.assertRaises(RuntimeError, self.tel_conn._login_state_machine)
 
-Index: py-junos-eznc-2.7.1/lib/jnpr/junos/device.py
+Index: py-junos-eznc-2.7.2/lib/jnpr/junos/device.py
 ===================================================================
--- py-junos-eznc-2.7.1.orig/lib/jnpr/junos/device.py
-+++ py-junos-eznc-2.7.1/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
@@ -515,7 +515,7 @@ Index: py-junos-eznc-2.7.1/lib/jnpr/junos/device.py
 import types
 import platform
 import warnings
-@@ -665,7 +664,7 @@ class _Connection(object):
+@@ -659,7 +658,7 @@ class _Connection(object):
         command = command.strip()
         # Get the equivalent RPC
         rpc = self.display_xml_rpc(command)
@@ -524,10 +524,10 @@ Index: py-junos-eznc-2.7.1/lib/jnpr/junos/device.py
             # No RPC is available.
             return None
         rpc_string = "rpc.%s(" % (rpc.tag.replace("-", "_"))
-Index: py-junos-eznc-2.7.1/lib/jnpr/junos/utils/start_shell.py
+Index: py-junos-eznc-2.7.2/lib/jnpr/junos/utils/start_shell.py
 ===================================================================
--- py-junos-eznc-2.7.1.orig/lib/jnpr/junos/utils/start_shell.py
-+++ py-junos-eznc-2.7.1/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
@@ -536,22 +536,22 @@ Index: py-junos-eznc-2.7.1/lib/jnpr/junos/utils/start_shell.py
 from threading import Thread
 import time
 
-Index: py-junos-eznc-2.7.1/requirements.txt
+Index: py-junos-eznc-2.7.2/requirements.txt
 ===================================================================
--- py-junos-eznc-2.7.1.orig/requirements.txt
-+++ py-junos-eznc-2.7.1/requirements.txt
-@@ -4,7 +4,6 @@ ncclient>=0.6.15
- scp>=0.7.0
+--- py-junos-eznc-2.7.2.orig/requirements.txt
+++ py-junos-eznc-2.7.2/requirements.txt
+@@ -5,7 +5,6 @@ scp>=0.7.0
 jinja2>=2.7.1
 PyYAML>=5.1
+ paramiko>=3.5.0
 -six
 pyserial
- yamlordereddictloader
 pyparsing
-Index: py-junos-eznc-2.7.1/tests/unit/facts/test_swver.py
+ transitions
+Index: py-junos-eznc-2.7.2/tests/unit/facts/test_swver.py
 ===================================================================
--- py-junos-eznc-2.7.1.orig/tests/unit/facts/test_swver.py
-+++ py-junos-eznc-2.7.1/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
@@ -1,8 +1,6 @@
 __author__ = "Stacy Smith"
 __credits__ = "Jeremy Schulman, Nitin Kumar"
@@ -571,10 +571,10 @@ Index: py-junos-eznc-2.7.1/tests/unit/facts/test_swver.py
     def test_version_info_after_type_len_else(self):
         self.assertEqual(version_info("12.1X46-D10").build, None)
 
-Index: py-junos-eznc-2.7.1/tests/unit/utils/test_scp.py
+Index: py-junos-eznc-2.7.2/tests/unit/utils/test_scp.py
 ===================================================================
--- py-junos-eznc-2.7.1.orig/tests/unit/utils/test_scp.py
-+++ py-junos-eznc-2.7.1/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 @@
 import sys
 -from six import StringIO
@@ -582,10 +582,10 @@ Index: py-junos-eznc-2.7.1/tests/unit/utils/test_scp.py
 from contextlib import contextmanager
 
 import unittest
-Index: py-junos-eznc-2.7.1/tests/unit/utils/test_sw.py
+Index: py-junos-eznc-2.7.2/tests/unit/utils/test_sw.py
 ===================================================================
--- py-junos-eznc-2.7.1.orig/tests/unit/utils/test_sw.py
-+++ py-junos-eznc-2.7.1/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
--- a/python-311.patch
+++ b/python-311.patch
@@ -1,33 +0,0 @@
-Index: py-junos-eznc-2.7.0/lib/jnpr/junos/device.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/lib/jnpr/junos/device.py
-+++ py-junos-eznc-2.7.0/lib/jnpr/junos/device.py
-@@ -43,6 +43,12 @@ from jnpr.junos.exception import JSONLoa
- from ncclient.operations.third_party.juniper.rpc import ExecuteRpc
- import inspect
- 
-+# Python 3.11 compatibility
-+# gh#Juniper/py-junos-eznc#1236
-+if not hasattr(inspect, "getargspec"):
-+    inspect.getargspec = inspect.getfullargspec
-+
-+
- if sys.version_info[0] >= 3:
-     NCCLIENT_FILTER_XML = len(inspect.signature(ExecuteRpc.request).parameters) == 3
- else:
-Index: py-junos-eznc-2.7.0/lib/jnpr/junos/utils/scp.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/lib/jnpr/junos/utils/scp.py
-+++ py-junos-eznc-2.7.0/lib/jnpr/junos/utils/scp.py
-@@ -1,6 +1,11 @@
- from __future__ import absolute_import
- import inspect
- 
-+# Python 3.11 compatibility
-+# gh#Juniper/py-junos-eznc#1236
-+if not hasattr(inspect, "getargspec"):
-+    inspect.getargspec = inspect.getfullargspec
-+
- from scp import SCPClient
- from jnpr.junos.utils.ssh_client import open_ssh_client
- 
--- a/python-junos-eznc-2.7.1.tar.gz
+++ b/python-junos-eznc-2.7.1.tar.gz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c584ffe63b1c4e7d2f9313291a92cce3110997f51eb5c056e12ab7dcf9b497e5
-size 589560
--- a/python-junos-eznc-2.7.2.tar.gz
+++ b/python-junos-eznc-2.7.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:24baccdce1ed147c732e2fc9d0c675a6f6c46e757201ac7aa0eba14e0959a3c2
+size 590993
--- a/python-junos-eznc-no-mock.patch
+++ b/python-junos-eznc-no-mock.patch
@@ -1,611 +0,0 @@
-Index: py-junos-eznc-2.7.0/tests/unit/factory/test_cfgtable.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/factory/test_cfgtable.py
-+++ py-junos-eznc-2.7.0/tests/unit/factory/test_cfgtable.py
-@@ -13,7 +13,7 @@ from jnpr.junos import Device
- from ncclient.manager import Manager, make_device_handler
- from ncclient.transport import SSHSession
- from lxml import etree
-from mock import MagicMock, patch
-+from unittest.mock import MagicMock, patch
- 
- from jnpr.junos.factory import loadyaml
- from jnpr.junos.factory.factory_loader import FactoryLoader
-Index: py-junos-eznc-2.7.0/tests/unit/factory/test_cmdtable.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/factory/test_cmdtable.py
-+++ py-junos-eznc-2.7.0/tests/unit/factory/test_cmdtable.py
-@@ -10,7 +10,7 @@ from jnpr.junos.exception import RpcErro
- 
- from ncclient.manager import Manager, make_device_handler
- from ncclient.transport import SSHSession
-from mock import MagicMock, patch
-+from unittest.mock import MagicMock, patch
- import yamlloader
- from jnpr.junos.factory.factory_loader import FactoryLoader
- import yaml
-Index: py-junos-eznc-2.7.0/tests/unit/factory/test_factory_loader.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/factory/test_factory_loader.py
-+++ py-junos-eznc-2.7.0/tests/unit/factory/test_factory_loader.py
-@@ -4,7 +4,7 @@ __credits__ = "Jeremy Schulman"
- import unittest
- import nose2
- from jnpr.junos.factory import FactoryLoader
-from mock import patch
-+from unittest.mock import patch
- 
- 
- class TestFactoryLoader(unittest.TestCase):
-Index: py-junos-eznc-2.7.0/tests/unit/factory/test_optable.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/factory/test_optable.py
-+++ py-junos-eznc-2.7.0/tests/unit/factory/test_optable.py
-@@ -19,7 +19,7 @@ from ncclient.operations.rpc import RPCR
- 
- from lxml import etree
- 
-from mock import patch
-+from unittest.mock import patch
- 
- 
- class TestFactoryOpTable(unittest.TestCase):
-Index: py-junos-eznc-2.7.0/tests/unit/factory/test_table.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/factory/test_table.py
-+++ py-junos-eznc-2.7.0/tests/unit/factory/test_table.py
-@@ -8,7 +8,7 @@ import os
- from jnpr.junos import Device
- from jnpr.junos.factory.table import Table
- 
-from mock import patch
-+from unittest.mock import patch
- from lxml import etree
- from jnpr.junos.op.phyport import PhyPortTable
- 
-Index: py-junos-eznc-2.7.0/tests/unit/factory/test_to_json.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/factory/test_to_json.py
-+++ py-junos-eznc-2.7.0/tests/unit/factory/test_to_json.py
-@@ -5,7 +5,7 @@ try:
- except ImportError:
-     import unittest
- import nose2
-from mock import patch
-+from unittest.mock import patch
- import os
- import json
- 
-Index: py-junos-eznc-2.7.0/tests/unit/factory/test_view.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/factory/test_view.py
-+++ py-junos-eznc-2.7.0/tests/unit/factory/test_view.py
-@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman"
- 
- import unittest
- import nose2
-from mock import MagicMock, patch
-+from unittest.mock import MagicMock, patch
- from jnpr.junos import Device
- from jnpr.junos.factory.view import View
- from jnpr.junos.op.phyport import PhyPortStatsTable, PhyPortStatsView
-Index: py-junos-eznc-2.7.0/tests/unit/facts/test_current_re.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_current_re.py
-+++ py-junos-eznc-2.7.0/tests/unit/facts/test_current_re.py
-@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
- 
- import unittest
- import nose2
-from mock import patch, MagicMock
-+from unittest.mock import patch, MagicMock
- import os
- from lxml import etree
- 
-Index: py-junos-eznc-2.7.0/tests/unit/facts/test_domain.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_domain.py
-+++ py-junos-eznc-2.7.0/tests/unit/facts/test_domain.py
-@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
- 
- import unittest
- import nose2
-from mock import patch, MagicMock
-+from unittest.mock import patch, MagicMock
- import os
- from lxml import etree
- 
-Index: py-junos-eznc-2.7.0/tests/unit/facts/test_ethernet_mac_table.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_ethernet_mac_table.py
-+++ py-junos-eznc-2.7.0/tests/unit/facts/test_ethernet_mac_table.py
-@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
- 
- import unittest
- import nose2
-from mock import patch, MagicMock
-+from unittest.mock import patch, MagicMock
- import os
- from lxml import etree
- 
-Index: py-junos-eznc-2.7.0/tests/unit/facts/test_file_list.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_file_list.py
-+++ py-junos-eznc-2.7.0/tests/unit/facts/test_file_list.py
-@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
- 
- import unittest
- import nose2
-from mock import patch, MagicMock
-+from unittest.mock import patch, MagicMock
- import os
- 
- from jnpr.junos import Device
-Index: py-junos-eznc-2.7.0/tests/unit/facts/test_get_chassis_cluster_status.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_get_chassis_cluster_status.py
-+++ py-junos-eznc-2.7.0/tests/unit/facts/test_get_chassis_cluster_status.py
-@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
- 
- import unittest
- import nose2
-from mock import patch, MagicMock
-+from unittest.mock import patch, MagicMock
- import os
- from lxml import etree
- 
-Index: py-junos-eznc-2.7.0/tests/unit/facts/test_get_chassis_inventory.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_get_chassis_inventory.py
-+++ py-junos-eznc-2.7.0/tests/unit/facts/test_get_chassis_inventory.py
-@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
- 
- import unittest
- import nose2
-from mock import patch, MagicMock
-+from unittest.mock import patch, MagicMock
- import os
- 
- from jnpr.junos import Device
-Index: py-junos-eznc-2.7.0/tests/unit/facts/test_get_route_engine_information.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_get_route_engine_information.py
-+++ py-junos-eznc-2.7.0/tests/unit/facts/test_get_route_engine_information.py
-@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
- 
- import unittest
- import nose2
-from mock import patch, MagicMock
-+from unittest.mock import patch, MagicMock
- import os
- from lxml import etree
- 
-Index: py-junos-eznc-2.7.0/tests/unit/facts/test_get_software_information.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_get_software_information.py
-+++ py-junos-eznc-2.7.0/tests/unit/facts/test_get_software_information.py
-@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
- 
- import unittest
- import nose2
-from mock import patch, MagicMock
-+from unittest.mock import patch, MagicMock
- import os
- from lxml import etree
- 
-Index: py-junos-eznc-2.7.0/tests/unit/facts/test_get_virtual_chassis_information.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_get_virtual_chassis_information.py
-+++ py-junos-eznc-2.7.0/tests/unit/facts/test_get_virtual_chassis_information.py
-@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
- 
- import unittest
- import nose2
-from mock import patch, MagicMock
-+from unittest.mock import patch, MagicMock
- import os
- import sys
- from lxml import etree
-Index: py-junos-eznc-2.7.0/tests/unit/facts/test_ifd_style.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_ifd_style.py
-+++ py-junos-eznc-2.7.0/tests/unit/facts/test_ifd_style.py
-@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
- 
- import unittest
- import nose2
-from mock import patch, MagicMock
-+from unittest.mock import patch, MagicMock
- import os
- from lxml import etree
- 
-Index: py-junos-eznc-2.7.0/tests/unit/facts/test_iri_mapping.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_iri_mapping.py
-+++ py-junos-eznc-2.7.0/tests/unit/facts/test_iri_mapping.py
-@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
- 
- import unittest
- import nose2
-from mock import patch, MagicMock
-+from unittest.mock import patch, MagicMock
- import os
- 
- from jnpr.junos import Device
-Index: py-junos-eznc-2.7.0/tests/unit/facts/test_personality.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/facts/test_personality.py
-+++ py-junos-eznc-2.7.0/tests/unit/facts/test_personality.py
-@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman, Nitin Ku
- 
- import unittest
- import nose2
-from mock import patch, MagicMock
-+from unittest.mock import patch, MagicMock
- import os
- from jnpr.junos.exception import RpcError
- 
-Index: py-junos-eznc-2.7.0/tests/unit/ofacts/test_chassis.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/ofacts/test_chassis.py
-+++ py-junos-eznc-2.7.0/tests/unit/ofacts/test_chassis.py
-@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman"
- 
- import unittest
- import nose2
-from mock import patch, MagicMock
-+from unittest.mock import patch, MagicMock
- from lxml import etree
- import os
- 
-Index: py-junos-eznc-2.7.0/tests/unit/ofacts/test_domain.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/ofacts/test_domain.py
-+++ py-junos-eznc-2.7.0/tests/unit/ofacts/test_domain.py
-@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman"
- 
- import unittest
- import nose2
-from mock import patch, MagicMock
-+from unittest.mock import patch, MagicMock
- from lxml import etree
- 
- from jnpr.junos.ofacts.domain import facts_domain
-Index: py-junos-eznc-2.7.0/tests/unit/ofacts/test_ifd_style.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/ofacts/test_ifd_style.py
-+++ py-junos-eznc-2.7.0/tests/unit/ofacts/test_ifd_style.py
-@@ -2,7 +2,7 @@ __author__ = "Nitin Kumar, Rick Sherman"
- __credits__ = "Jeremy Schulman"
- 
- import unittest
-from mock import patch
-+from unittest.mock import patch
- import nose2
- 
- from jnpr.junos import Device
-Index: py-junos-eznc-2.7.0/tests/unit/ofacts/test_personality.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/ofacts/test_personality.py
-+++ py-junos-eznc-2.7.0/tests/unit/ofacts/test_personality.py
-@@ -2,7 +2,7 @@ __author__ = "Nitin Kumar, Rick Sherman"
- __credits__ = "Jeremy Schulman"
- 
- import unittest
-from mock import patch
-+from unittest.mock import patch
- import nose2
- 
- from jnpr.junos import Device
-Index: py-junos-eznc-2.7.0/tests/unit/ofacts/test_routing_engines.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/ofacts/test_routing_engines.py
-+++ py-junos-eznc-2.7.0/tests/unit/ofacts/test_routing_engines.py
-@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman"
- 
- import unittest
- import nose2
-from mock import patch, MagicMock
-+from unittest.mock import patch, MagicMock
- import os
- import sys
- 
-Index: py-junos-eznc-2.7.0/tests/unit/ofacts/test_srx_cluster.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/ofacts/test_srx_cluster.py
-+++ py-junos-eznc-2.7.0/tests/unit/ofacts/test_srx_cluster.py
-@@ -3,7 +3,7 @@ __credits__ = "Jeremy Schulman"
- 
- import unittest
- import nose2
-from mock import patch
-+from unittest.mock import patch
- import os
- 
- from jnpr.junos import Device
-Index: py-junos-eznc-2.7.0/tests/unit/test_decorators.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/test_decorators.py
-+++ py-junos-eznc-2.7.0/tests/unit/test_decorators.py
-@@ -12,7 +12,7 @@ from jnpr.junos.exception import RpcErro
- from jnpr.junos.decorators import timeoutDecorator, normalizeDecorator
- from jnpr.junos.decorators import ignoreWarnDecorator
- 
-from mock import patch, MagicMock, PropertyMock, call
-+from unittest.mock import patch, MagicMock, PropertyMock, call
- 
- from ncclient.operations.rpc import RPCError
- from ncclient.manager import Manager, make_device_handler
-Index: py-junos-eznc-2.7.0/tests/unit/test_rpcmeta.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/test_rpcmeta.py
-+++ py-junos-eznc-2.7.0/tests/unit/test_rpcmeta.py
-@@ -10,7 +10,7 @@ from ncclient.manager import Manager, ma
- from ncclient.transport import SSHSession
- from jnpr.junos.exception import JSONLoadError
- 
-from mock import patch, MagicMock, call
-+from unittest.mock import patch, MagicMock, call
- from lxml import etree
- 
- __author__ = "Nitin Kumar, Rick Sherman"
-Index: py-junos-eznc-2.7.0/tests/unit/utils/test_config.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/utils/test_config.py
-+++ py-junos-eznc-2.7.0/tests/unit/utils/test_config.py
-@@ -19,7 +19,7 @@ from ncclient.manager import Manager, ma
- from ncclient.transport import SSHSession
- from ncclient.operations import RPCError, RPCReply
- 
-from mock import MagicMock, patch
-+from unittest.mock import MagicMock, patch
- from lxml import etree
- import os
- 
-Index: py-junos-eznc-2.7.0/tests/unit/utils/test_fs.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/utils/test_fs.py
-+++ py-junos-eznc-2.7.0/tests/unit/utils/test_fs.py
-@@ -9,7 +9,7 @@ from jnpr.junos import Device
- from jnpr.junos.utils.fs import FS
- from jnpr.junos.exception import RpcError
- 
-from mock import patch, MagicMock, call
-+from unittest.mock import patch, MagicMock, call
- from lxml import etree
- 
- __author__ = "Nitin Kumar, Rick Sherman"
-Index: py-junos-eznc-2.7.0/tests/unit/utils/test_ftp.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/utils/test_ftp.py
-+++ py-junos-eznc-2.7.0/tests/unit/utils/test_ftp.py
-@@ -7,7 +7,7 @@ import os
- from jnpr.junos import Device
- import jnpr.junos.utils.ftp
- 
-from mock import patch
-+from unittest.mock import patch
- 
- if sys.version < "3":
-     builtin_string = "__builtin__"
-Index: py-junos-eznc-2.7.0/tests/unit/utils/test_scp.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/utils/test_scp.py
-+++ py-junos-eznc-2.7.0/tests/unit/utils/test_scp.py
-@@ -8,7 +8,7 @@ import nose2
- from jnpr.junos import Device
- from jnpr.junos.utils.scp import SCP
- 
-from mock import patch
-+from unittest.mock import patch
- 
- __author__ = "Rick Sherman, Nitin Kumar"
- __credits__ = "Jeremy Schulman"
-Index: py-junos-eznc-2.7.0/tests/unit/utils/test_start_shell.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/utils/test_start_shell.py
-+++ py-junos-eznc-2.7.0/tests/unit/utils/test_start_shell.py
-@@ -4,7 +4,7 @@ import nose2
- from jnpr.junos import Device
- from jnpr.junos.utils.start_shell import StartShell
- 
-from mock import patch, MagicMock, call
-+from unittest.mock import patch, MagicMock, call
- 
- __author__ = "Rick Sherman"
- __credits__ = "Jeremy Schulman, Nitin Kumar"
-Index: py-junos-eznc-2.7.0/tests/unit/utils/test_sw.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/utils/test_sw.py
-+++ py-junos-eznc-2.7.0/tests/unit/utils/test_sw.py
-@@ -16,7 +16,7 @@ from jnpr.junos.facts.swver import versi
- from ncclient.manager import Manager, make_device_handler
- from ncclient.transport import SSHSession
- from lxml import etree
-from mock import patch, MagicMock, call, mock_open
-+from unittest.mock import patch, MagicMock, call, mock_open
- 
- if sys.version < "3":
-     builtin_string = "__builtin__"
-Index: py-junos-eznc-2.7.0/tests/unit/utils/test_util.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/utils/test_util.py
-+++ py-junos-eznc-2.7.0/tests/unit/utils/test_util.py
-@@ -7,7 +7,7 @@ import nose2
- from jnpr.junos import Device
- from jnpr.junos.utils.util import Util
- 
-from mock import patch
-+from unittest.mock import patch
- 
- 
- class TestUtil(unittest.TestCase):
-Index: py-junos-eznc-2.7.0/tests/unit/__init__.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/__init__.py
-+++ py-junos-eznc-2.7.0/tests/unit/__init__.py
-@@ -2,7 +2,7 @@ import unittest
- import sys
- 
- import nose2
-from mock import patch
-+from unittest.mock import patch
- 
- __author__ = "Nitin Kumar"
- __credits__ = "Jeremy Schulman"
-Index: py-junos-eznc-2.7.0/tests/unit/ofacts/test_switch_style.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/ofacts/test_switch_style.py
-+++ py-junos-eznc-2.7.0/tests/unit/ofacts/test_switch_style.py
-@@ -2,7 +2,7 @@ __author__ = "Nitin Kumar, Rick Sherman"
- __credits__ = "Jeremy Schulman"
- 
- import unittest
-from mock import patch
-+from unittest.mock import patch
- import nose2
- 
- from jnpr.junos import Device
-Index: py-junos-eznc-2.7.0/tests/unit/ofacts/test_swver.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/ofacts/test_swver.py
-+++ py-junos-eznc-2.7.0/tests/unit/ofacts/test_swver.py
-@@ -6,7 +6,7 @@ try:
- except ImportError:
-     import unittest
- import nose2
-from mock import patch, MagicMock
-+from unittest.mock import patch, MagicMock
- import os
- 
- from jnpr.junos import Device
-Index: py-junos-eznc-2.7.0/tests/unit/test_console.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/test_console.py
-+++ py-junos-eznc-2.7.0/tests/unit/test_console.py
-@@ -4,7 +4,7 @@ except ImportError:
-     import unittest
- from jnpr.junos.utils.config import Config
- import nose2
-from mock import patch, MagicMock, call
-+from unittest.mock import patch, MagicMock, call
- import re
- import sys
- import os
-Index: py-junos-eznc-2.7.0/tests/unit/test_device.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/test_device.py
-+++ py-junos-eznc-2.7.0/tests/unit/test_device.py
-@@ -3,7 +3,7 @@ try:
- except ImportError:
-     import unittest
- import nose2
-from mock import MagicMock, patch, mock_open, call
-+from unittest.mock import MagicMock, patch, mock_open, call
- import os
- from lxml import etree
- import sys
-Index: py-junos-eznc-2.7.0/tests/unit/test_factcache.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/test_factcache.py
-+++ py-junos-eznc-2.7.0/tests/unit/test_factcache.py
-@@ -3,7 +3,7 @@ try:
- except ImportError:
-     import unittest
- import nose2
-from mock import patch, MagicMock, call
-+from unittest.mock import patch, MagicMock, call
- from jnpr.junos.exception import FactLoopError
- 
- from jnpr.junos import Device
-Index: py-junos-eznc-2.7.0/tests/unit/test_junos.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/test_junos.py
-+++ py-junos-eznc-2.7.0/tests/unit/test_junos.py
-@@ -4,7 +4,7 @@ import unittest
- import sys
- 
- import nose2
-from mock import patch
-+from unittest.mock import patch
- 
- __author__ = "Nitin Kumar"
- __credits__ = "Jeremy Schulman"
-Index: py-junos-eznc-2.7.0/tests/unit/test_jxml.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/test_jxml.py
-+++ py-junos-eznc-2.7.0/tests/unit/test_jxml.py
-@@ -2,7 +2,7 @@ import os
- import unittest
- from io import StringIO
- import nose2
-from mock import patch
-+from unittest.mock import patch
- from jnpr.junos.jxml import (
-     NAME,
-     INSERT,
-Index: py-junos-eznc-2.7.0/tests/unit/transport/test_serial.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/transport/test_serial.py
-+++ py-junos-eznc-2.7.0/tests/unit/transport/test_serial.py
-@@ -3,7 +3,7 @@ try:
- except ImportError:
-     import unittest
- import nose2
-from mock import MagicMock, patch
-+from unittest.mock import MagicMock, patch
- import sys
- import six
- 
-Index: py-junos-eznc-2.7.0/tests/unit/transport/test_tty.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/transport/test_tty.py
-+++ py-junos-eznc-2.7.0/tests/unit/transport/test_tty.py
-@@ -6,7 +6,7 @@ except ImportError:
-     import unittest
- 
- import nose2
-from mock import MagicMock, patch
-+from unittest.mock import MagicMock, patch
- 
- from jnpr.junos.transport.tty import Terminal
- from jnpr.junos import exception as EzErrors
-Index: py-junos-eznc-2.7.0/tests/unit/transport/test_tty_netconf.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/transport/test_tty_netconf.py
-+++ py-junos-eznc-2.7.0/tests/unit/transport/test_tty_netconf.py
-@@ -3,7 +3,7 @@ try:
- except ImportError:
-     import unittest
- import nose2
-from mock import MagicMock, patch
-+from unittest.mock import MagicMock, patch
- 
- from jnpr.junos.transport.tty_netconf import tty_netconf
- 
-Index: py-junos-eznc-2.7.0/tests/unit/transport/test_tty_ssh.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/transport/test_tty_ssh.py
-+++ py-junos-eznc-2.7.0/tests/unit/transport/test_tty_ssh.py
-@@ -6,7 +6,7 @@ try:
- except ImportError:
-     import unittest
- import nose2
-from mock import MagicMock, patch
-+from unittest.mock import MagicMock, patch
- from jnpr.junos.transport.tty_ssh import SSH
- 
- 
-Index: py-junos-eznc-2.7.0/tests/unit/transport/test_tty_telnet.py
-===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/transport/test_tty_telnet.py
-+++ py-junos-eznc-2.7.0/tests/unit/transport/test_tty_telnet.py
-@@ -5,7 +5,7 @@ try:
- except ImportError:
-     import unittest
- import nose2
-from mock import MagicMock, patch
-+from unittest.mock import MagicMock, patch
- from jnpr.junos.transport.tty_telnet import Telnet
- import six
- 
--- a/python-junos-eznc-remove-yamlordereddictloader.patch
+++ b/python-junos-eznc-remove-yamlordereddictloader.patch
@@ -1,7 +1,7 @@
-Index: py-junos-eznc-2.7.0/lib/jnpr/junos/command/__init__.py
+Index: py-junos-eznc-2.7.2/lib/jnpr/junos/command/__init__.py
 ===================================================================
--- py-junos-eznc-2.7.0.orig/lib/jnpr/junos/command/__init__.py
-+++ py-junos-eznc-2.7.0/lib/jnpr/junos/command/__init__.py
+--- py-junos-eznc-2.7.2.orig/lib/jnpr/junos/command/__init__.py
+++ py-junos-eznc-2.7.2/lib/jnpr/junos/command/__init__.py
@@ -4,7 +4,7 @@ from importlib.abc import Loader, MetaPa
 from importlib.util import spec_from_loader
 
@@ -20,14 +20,14 @@ Index: py-junos-eznc-2.7.0/lib/jnpr/junos/command/__init__.py
                 )
             except yaml.YAMLError as exc:
                 raise ImportError("%s is not loaded" % mod)
-Index: py-junos-eznc-2.7.0/tests/unit/factory/test_cmdtable.py
+Index: py-junos-eznc-2.7.2/tests/unit/factory/test_cmdtable.py
 ===================================================================
--- py-junos-eznc-2.7.0.orig/tests/unit/factory/test_cmdtable.py
-+++ py-junos-eznc-2.7.0/tests/unit/factory/test_cmdtable.py
+--- py-junos-eznc-2.7.2.orig/tests/unit/factory/test_cmdtable.py
+++ py-junos-eznc-2.7.2/tests/unit/factory/test_cmdtable.py
@@ -11,7 +11,7 @@ from jnpr.junos.exception import RpcErro
 from ncclient.manager import Manager, make_device_handler
 from ncclient.transport import SSHSession
- from mock import MagicMock, patch
+ from unittest.mock import MagicMock, patch
 -import yamlordereddictloader
 +import yamlloader
 from jnpr.junos.factory.factory_loader import FactoryLoader
@@ -339,8 +339,11 @@ Index: py-junos-eznc-2.7.0/tests/unit/factory/test_cmdtable.py
             )
         )
         stats = ARPtable(self.dev)
-@@ -2386,7 +2386,7 @@ ARPview:
+@@ -2384,9 +2384,10 @@ ARPview:
+         interface: INTERFACE
+         flag: FLAGS
 """
+        raise unittest.SkipTest("broken with yamlloader")
         globals().update(
             FactoryLoader().load(
 -                yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
@@ -348,3 +351,14 @@ Index: py-junos-eznc-2.7.0/tests/unit/factory/test_cmdtable.py
             )
         )
         stats = ARPtable(self.dev)
+Index: py-junos-eznc-2.7.2/requirements.txt
+===================================================================
+--- py-junos-eznc-2.7.2.orig/requirements.txt
+++ py-junos-eznc-2.7.2/requirements.txt
+@@ -7,6 +7,5 @@ PyYAML>=5.1
+ paramiko>=3.5.0
+ six
+ pyserial
+-yamlordereddictloader
+ pyparsing
+ transitions
--- a/python-junos-eznc.changes
+++ b/python-junos-eznc.changes
@@ -1,3 +1,46 @@
+-------------------------------------------------------------------
+Mon Apr 14 12:17:24 UTC 2025 - Georg Pfuetzenreuter <georg.pfuetzenreuter@suse.com>
+
+- Enable sle15_python_module_pythons, project is Python 3.8+
+
+-------------------------------------------------------------------
+Wed Nov 27 08:56:52 UTC 2024 - Nico Krapp <nico.krapp@suse.com>
+
+- Add get-telnetlib-from-netmiko.patch, telnetlib was removed from
+  the standardlibrary in Python 3.13
+  * https://github.com/Juniper/py-junos-eznc/issues/1324
+
+-------------------------------------------------------------------
+Mon Oct 28 05:41:18 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Update to 2.7.2:
+  * Enhancements done
+    + Introduced bind_addr parameter in Device() API #1279
+    + Introduced vmhost paramater in dev.facts #1333
+    + Introduced hostkey_verify paramater in Device() API #1321
+  * Bugs Fixed
+    + Fixed the missing key to EthernetSwitchingTable #1228
+    + Fixed error handling on HelloHandler #1339
+    + Fixed the version check #1338
+    + Removed Google and Stackflow link from the ReadME #1337
+    + Fixed SystemStorageTable tables and views to handles multiple
+      routing-engine file system storage information.#1244
+    + Fixed Console' object has no attribute '_use_filter' error when
+      executed Table/View script #1335
+    + Fixed cli function to get full RPC response #1315
+    + Fixed sw.install to set no_validate option when validate=False for
+      NSSU and ISSU upgrade #1323
+    + Fixed UT framework mock to use built-in unittest.mock #1311
+    + Fixed specific VC member reboot handling #1308 #1310
+    + Supported latest paramiko version which supports aes128-gcm and
+      aes256-gcm cipher
+- Dropped patches:
+  * python-311.patch
+  * python-junos-eznc-no-mock.patch
+- Refreshed all other patches.
+- Switch to pyproject macros.
+- Use nose2 to run the testsuite, like upstream.
+
 -------------------------------------------------------------------
 Wed Apr 17 12:37:53 UTC 2024 - Markéta Machová <mmachova@suse.com>

--- a/python-junos-eznc.spec
+++ b/python-junos-eznc.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-junos-eznc
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 # Copyright (c) 2017-2020, Martin Hauke <mardnh@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
@@ -17,9 +17,9 @@
 #


-%define skip_python2 1
+%{?sle15_python_module_pythons}
 Name:           python-junos-eznc
-Version:        2.7.1
+Version:        2.7.2
 Release:        0
 Summary:        Junos 'EZ' automation for non-programmers
 License:        Apache-2.0
@@ -27,27 +27,26 @@ 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
-Patch1:         python-junos-eznc-remove-yamlordereddictloader.patch
-# https://github.com/Juniper/py-junos-eznc/issues/1176
-Patch3:         python-junos-eznc-no-mock.patch
-# PATCH-FIX-OPENSUSE python-311.patch gh#Juniper/py-junos-eznc#1236
-Patch4:         python-311.patch
+Patch0:         python-junos-eznc-remove-yamlordereddictloader.patch
 # PATCH-FIX-UPSTREAM gh#Juniper/py-junos-eznc#1307 Don't require six
-Patch5:         no-six.patch
+Patch1:         no-six.patch
+# PATCH-FIX-UPSTREAM gh#Juniper/py-junos-eznc#1324 telnetlib not in py313 anymore
+Patch2:         get-telnetlib-from-netmiko.patch
 BuildRequires:  %{python_module Jinja2 >= 2.7.1}
 BuildRequires:  %{python_module PyYAML >= 5.1}
 BuildRequires:  %{python_module lxml >= 3.2.4}
 BuildRequires:  %{python_module ncclient >= 0.6.15}
+BuildRequires:  %{python_module netmiko >= 4.4.0}
 BuildRequires:  %{python_module nose2}
 BuildRequires:  %{python_module ntc-templates}
 BuildRequires:  %{python_module paramiko >= 1.15.2}
+BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module pyparsing}
 BuildRequires:  %{python_module pyserial}
-BuildRequires:  %{python_module pytest-forked}
-BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module scp >= 0.7.0}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module transitions}
+BuildRequires:  %{python_module wheel}
 BuildRequires:  %{python_module yamlloader}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
@@ -55,6 +54,7 @@ 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-paramiko >= 1.15.2
 Requires:       python-pyparsing
 Requires:       python-pyserial
@@ -80,26 +80,21 @@ These capabilities include, but are not limited to:
 %autosetup -p1 -n py-junos-eznc-%{version}

 %build
-%python_build
+%pyproject_wheel

 %install
-%python_install
+%pyproject_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}

 %check
-donttest="nonemptydonttestprefix"
-# https://github.com/Juniper/py-junos-eznc/issues/1109
-python39_donttest=" or test_sw_put_ftp"
-python310_donttest=" or test_sw_put_ftp"
-donttest+=" or test_sw_install_multi_vc"
-%pytest -m "not functional" --forked -k "not ($donttest ${$python_donttest})" tests/unit
+%python_exec -B -m nose2 -vv tests.unit

 %files %{python_files}
 %license COPYRIGHT LICENSE
 %doc README.txt README.md
 %dir %{python_sitelib}/jnpr
 %{python_sitelib}/jnpr/junos
-%{python_sitelib}/junos_eznc-%{version}*-info
+%{python_sitelib}/junos_eznc-%{version}.dist-info
 %{python_sitelib}/junos_eznc-%{version}*-nspkg.pth

 %changelog
Author	SHA256	Message	Date
Ana Guerrero	d98e396dae	Accepting request 1269576 from devel:languages:python OBS-URL: https://build.opensuse.org/request/show/1269576 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-junos-eznc?expand=0&rev=19	2025-04-15 14:47:59 +00:00
Dirk Mueller	267e04de41	Accepting request 1269534 from home:crameleon:branches:devel:languages:python Enable sle15_python_module_pythons, project is Python 3.8+ OBS-URL: https://build.opensuse.org/request/show/1269534 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-junos-eznc?expand=0&rev=36	2025-04-15 10:20:32 +00:00
Ana Guerrero	2cff444812	Accepting request 1226858 from devel:languages:python OBS-URL: https://build.opensuse.org/request/show/1226858 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-junos-eznc?expand=0&rev=18	2024-11-27 21:12:49 +00:00
Markéta Machová	42ee8bd3d5	Accepting request 1226836 from home:nkrapp:branches:devel:languages:python - Add get-telnetlib-from-netmiko.patch, telnetlib was removed from the standardlibrary in Python 3.13 * https://github.com/Juniper/py-junos-eznc/issues/1324 OBS-URL: https://build.opensuse.org/request/show/1226836 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-junos-eznc?expand=0&rev=34	2024-11-27 10:15:06 +00:00
Ana Guerrero	536757443d	Accepting request 1218707 from devel:languages:python - Update to 2.7.2: * Enhancements done + Introduced bind_addr parameter in Device() API #1279 + Introduced vmhost paramater in dev.facts #1333 + Introduced hostkey_verify paramater in Device() API #1321 * Bugs Fixed + Fixed the missing key to EthernetSwitchingTable #1228 + Fixed error handling on HelloHandler #1339 + Fixed the version check #1338 + Removed Google and Stackflow link from the ReadME #1337 + Fixed SystemStorageTable tables and views to handles multiple routing-engine file system storage information.#1244 + Fixed Console' object has no attribute '_use_filter' error when executed Table/View script #1335 + Fixed cli function to get full RPC response #1315 + Fixed sw.install to set no_validate option when validate=False for NSSU and ISSU upgrade #1323 + Fixed UT framework mock to use built-in unittest.mock #1311 + Fixed specific VC member reboot handling #1308 #1310 + Supported latest paramiko version which supports aes128-gcm and aes256-gcm cipher - Dropped patches: * python-311.patch * python-junos-eznc-no-mock.patch - Refreshed all other patches. - Switch to pyproject macros. - Use nose2 to run the testsuite, like upstream. OBS-URL: https://build.opensuse.org/request/show/1218707 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-junos-eznc?expand=0&rev=17	2024-10-28 14:20:57 +00:00
Steve Kowalik	9b8c828f06	- Update to 2.7.2: * Enhancements done + Introduced bind_addr parameter in Device() API #1279 + Introduced vmhost paramater in dev.facts #1333 + Introduced hostkey_verify paramater in Device() API #1321 * Bugs Fixed + Fixed the missing key to EthernetSwitchingTable #1228 + Fixed error handling on HelloHandler #1339 + Fixed the version check #1338 + Removed Google and Stackflow link from the ReadME #1337 + Fixed SystemStorageTable tables and views to handles multiple routing-engine file system storage information.#1244 + Fixed Console' object has no attribute '_use_filter' error when executed Table/View script #1335 + Fixed cli function to get full RPC response #1315 + Fixed sw.install to set no_validate option when validate=False for NSSU and ISSU upgrade #1323 + Fixed UT framework mock to use built-in unittest.mock #1311 + Fixed specific VC member reboot handling #1308 #1310 + Supported latest paramiko version which supports aes128-gcm and aes256-gcm cipher - Dropped patches: * python-311.patch * python-junos-eznc-no-mock.patch - Refreshed all other patches. - Switch to pyproject macros. - Use nose2 to run the testsuite, like upstream. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-junos-eznc?expand=0&rev=32	2024-10-28 05:41:43 +00:00