JP-0 | feat: support for pythjon3.12

Juniper · Dec 28, 2023 · 8523f61 · 8523f61
1 parent 4ea83de
commit 8523f61
Show file tree

Hide file tree

Showing 55 changed files with 261 additions and 295 deletions.
diff --git a/docs/conf.py b/docs/conf.py
diff --git a/tests/functional/test_core.py b/tests/functional/test_core.py
@@ -7,6 +7,7 @@
 
 from jnpr.junos.exception import RpcTimeoutError
 
+
 class TestCore(unittest.TestCase):
     @classmethod
     def setUpClass(self):

diff --git a/tests/functional/test_outbound_ssh.py b/tests/functional/test_outbound_ssh.py
@@ -5,6 +5,7 @@
 import socket
 from jnpr.junos import Device
 
+
 class TestDeviceSsh(unittest.TestCase):
     def tearDown(self):
         self.dev.close()

diff --git a/tests/functional/test_shell.py b/tests/functional/test_shell.py
@@ -7,11 +7,12 @@
 
 import yaml
 
-class test(unittest.TestCase):
 
+class test(unittest.TestCase):
     @classmethod
     def setUpClass(self):
         from jnpr.junos import Device
+
         with open("config.yaml", "r") as fyaml:
             cfg = yaml.safe_load(fyaml)
         self.dev = Device(**cfg)
@@ -23,24 +24,28 @@ def tearDownClass(self):
 
     def test_shell_run(self):
         from jnpr.junos.utils.start_shell import StartShell
+
         with StartShell(self.dev) as sh:
-            output = sh.run('pwd')
+            output = sh.run("pwd")
             self.assertTrue(output[0])
 
     def test_shell_run_with_sleep(self):
         from jnpr.junos.utils.start_shell import StartShell
+
         with StartShell(self.dev) as sh:
-            output = sh.run('hostname', sleep=2)
+            output = sh.run("hostname", sleep=2)
             self.assertTrue(output[0])
 
     def test_shell_run_shell_type_ssh(self):
         from jnpr.junos.utils.start_shell import StartShell
+
         with StartShell(self.dev, shell_type="ssh") as sh:
-            output = sh.run('hostname', sleep=2)
+            output = sh.run("hostname", sleep=2)
             self.assertTrue(output[0])
 
     def test_shell_run_shell_type_csh(self):
         from jnpr.junos.utils.start_shell import StartShell
+
         with StartShell(self.dev, shell_type="csh") as sh:
-            output = sh.run('hostname', sleep=2)
+            output = sh.run("hostname", sleep=2)
             self.assertTrue(output[0])
diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py
@@ -8,7 +8,6 @@
 __credits__ = "Jeremy Schulman"
 
 
-
 class TestJunosInit(unittest.TestCase):
     def test_warning(self):
         with patch.object(sys.modules["sys"], "version_info", (3, 8, 0)) as mock_sys:

diff --git a/tests/unit/factory/test_cfgtable.py b/tests/unit/factory/test_cfgtable.py
@@ -85,7 +85,6 @@
 globals().update(FactoryLoader().load(yaml.load(yaml_bgp_data, Loader=yaml.FullLoader)))
 
 
-
 @unittest.skipIf(sys.platform == "win32", "will work for windows in coming days")
 class TestFactoryCfgTable(unittest.TestCase):
     @patch("ncclient.manager.connect")

diff --git a/tests/unit/factory/test_cmdtable.py b/tests/unit/factory/test_cmdtable.py
diff --git a/tests/unit/factory/test_factory_cls.py b/tests/unit/factory/test_factory_cls.py
@@ -8,7 +8,6 @@
 from jnpr.junos.factory.factory_cls import FactoryTable, FactoryView
 
 
-
 class TestFactoryCls(unittest.TestCase):
     def test_factory_cls_cfgtable(self):
         t = FactoryCfgTable()

diff --git a/tests/unit/factory/test_factory_loader.py b/tests/unit/factory/test_factory_loader.py
@@ -7,7 +7,6 @@
 from mock import patch
 
 
-
 class TestFactoryLoader(unittest.TestCase):
     def setUp(self):
         self.fl = FactoryLoader()

diff --git a/tests/unit/factory/test_optable.py b/tests/unit/factory/test_optable.py
@@ -22,7 +22,6 @@
 from mock import patch
 
 
-
 class TestFactoryOpTable(unittest.TestCase):
     @patch("ncclient.manager.connect")
     def setUp(self, mock_connect):

diff --git a/tests/unit/factory/test_table.py b/tests/unit/factory/test_table.py
@@ -23,7 +23,6 @@
     builtin_string = "builtins"
 
 
-
 class TestFactoryTable(unittest.TestCase):
     @patch("ncclient.manager.connect")
     def setUp(self, mock_connect):

diff --git a/tests/unit/factory/test_to_json.py b/tests/unit/factory/test_to_json.py
@@ -21,7 +21,6 @@
 from ncclient.operations.rpc import RPCReply
 
 
-
 class TestToJson(unittest.TestCase):
     @patch("ncclient.manager.connect")
     def setUp(self, mock_connect):

diff --git a/tests/unit/factory/test_view.py b/tests/unit/factory/test_view.py
@@ -10,7 +10,6 @@
 from lxml import etree
 
 
-
 class TestFactoryView(unittest.TestCase):
     def setUp(self):
         self.dev = Device(

diff --git a/tests/unit/factory/test_view_fields.py b/tests/unit/factory/test_view_fields.py
@@ -7,7 +7,6 @@
 from jnpr.junos.factory.viewfields import ViewFields
 
 
-
 class TestFactoryViewFields(unittest.TestCase):
     def setUp(self):
         self.vf = ViewFields()

diff --git a/tests/unit/facts/test__init__.py b/tests/unit/facts/test__init__.py
@@ -12,7 +12,6 @@
 import jnpr.junos.facts
 
 
-
 class TestFactInitialization(unittest.TestCase):
     def test_duplicate_facts(self):
         module = importlib.import_module("tests.unit.facts.dupe_foo1")

diff --git a/tests/unit/facts/test_current_re.py b/tests/unit/facts/test_current_re.py
@@ -14,7 +14,6 @@
 from ncclient.transport import SSHSession
 
 
-
 class TestCurrentRe(unittest.TestCase):
     @patch("ncclient.manager.connect")
     def setUp(self, mock_connect):

diff --git a/tests/unit/facts/test_domain.py b/tests/unit/facts/test_domain.py
@@ -14,7 +14,6 @@
 from ncclient.transport import SSHSession
 
 
-
 class TestDomain(unittest.TestCase):
     @patch("ncclient.manager.connect")
     def setUp(self, mock_connect):

diff --git a/tests/unit/facts/test_ethernet_mac_table.py b/tests/unit/facts/test_ethernet_mac_table.py
@@ -14,7 +14,6 @@
 from ncclient.transport import SSHSession
 
 
-
 class TestEthernetMacTable(unittest.TestCase):
     @patch("ncclient.manager.connect")
     def setUp(self, mock_connect):

diff --git a/tests/unit/facts/test_file_list.py b/tests/unit/facts/test_file_list.py
@@ -12,7 +12,6 @@
 from ncclient.transport import SSHSession
 
 
-
 class TestFileList(unittest.TestCase):
     @patch("ncclient.manager.connect")
     def setUp(self, mock_connect):

diff --git a/tests/unit/facts/test_get_chassis_cluster_status.py b/tests/unit/facts/test_get_chassis_cluster_status.py
@@ -14,7 +14,6 @@
 from ncclient.transport import SSHSession
 
 
-
 class TestGetChassisClusterStatus(unittest.TestCase):
     @patch("ncclient.manager.connect")
     def setUp(self, mock_connect):

diff --git a/tests/unit/facts/test_get_chassis_inventory.py b/tests/unit/facts/test_get_chassis_inventory.py
@@ -12,7 +12,6 @@
 from ncclient.transport import SSHSession
 
 
-
 class TestChassis(unittest.TestCase):
     @patch("ncclient.manager.connect")
     def setUp(self, mock_connect):

diff --git a/tests/unit/facts/test_get_route_engine_information.py b/tests/unit/facts/test_get_route_engine_information.py
@@ -13,7 +13,6 @@
 from ncclient.transport import SSHSession
 
 
-
 class TestGetRouteEngineInformation(unittest.TestCase):
     @patch("ncclient.manager.connect")
     def setUp(self, mock_connect):

diff --git a/tests/unit/facts/test_get_software_information.py b/tests/unit/facts/test_get_software_information.py
@@ -14,7 +14,6 @@
 from ncclient.transport import SSHSession
 
 
-
 class TestGetSoftwareInformation(unittest.TestCase):
     @patch("ncclient.manager.connect")
     def setUp(self, mock_connect):

diff --git a/tests/unit/facts/test_get_virtual_chassis_information.py b/tests/unit/facts/test_get_virtual_chassis_information.py
@@ -15,7 +15,6 @@
 from ncclient.transport import SSHSession
 
 
-
 class TestGetVirtualChassisInformation(unittest.TestCase):
     @patch("ncclient.manager.connect")
     def setUp(self, mock_connect):

diff --git a/tests/unit/facts/test_ifd_style.py b/tests/unit/facts/test_ifd_style.py
@@ -14,7 +14,6 @@
 from ncclient.transport import SSHSession
 
 
-
 class TestIfdStyle(unittest.TestCase):
     @patch("ncclient.manager.connect")
     def setUp(self, mock_connect):

diff --git a/tests/unit/facts/test_iri_mapping.py b/tests/unit/facts/test_iri_mapping.py
@@ -12,7 +12,6 @@
 from ncclient.transport import SSHSession
 
 
-
 class TestIriMapping(unittest.TestCase):
     @patch("ncclient.manager.connect")
     def setUp(self, mock_connect):

diff --git a/tests/unit/facts/test_personality.py b/tests/unit/facts/test_personality.py
@@ -13,7 +13,6 @@
 from ncclient.transport import SSHSession
 
 
-
 class TestPersonality(unittest.TestCase):
     @patch("ncclient.manager.connect")
     def setUp(self, mock_connect):

diff --git a/tests/unit/facts/test_swver.py b/tests/unit/facts/test_swver.py
@@ -12,7 +12,6 @@
 from jnpr.junos.facts.swver import version_info, get_facts
 
 
-
 class TestVersionInfo(unittest.TestCase):
     if six.PY2:
         assertCountEqual = unittest.TestCase.assertItemsEqual

diff --git a/tests/unit/ofacts/test_chassis.py b/tests/unit/ofacts/test_chassis.py
@@ -16,7 +16,6 @@
 from ncclient.transport import SSHSession
 
 
-
 class TestChassis(unittest.TestCase):
     @patch("ncclient.manager.connect")
     @patch("jnpr.junos.device.warnings")

diff --git a/tests/unit/ofacts/test_domain.py b/tests/unit/ofacts/test_domain.py
@@ -11,7 +11,6 @@
 from jnpr.junos.exception import RpcError
 
 
-
 class TestDomain(unittest.TestCase):
     @patch("ncclient.manager.connect")
     @patch("jnpr.junos.device.warnings")

diff --git a/tests/unit/ofacts/test_ifd_style.py b/tests/unit/ofacts/test_ifd_style.py
@@ -9,7 +9,6 @@
 from jnpr.junos.ofacts.ifd_style import facts_ifd_style as ifd_style
 
 
-
 class TestIFDStyle(unittest.TestCase):
     @patch("jnpr.junos.device.warnings")
     def setUp(self, mock_warnings):

diff --git a/tests/unit/ofacts/test_personality.py b/tests/unit/ofacts/test_personality.py
@@ -9,7 +9,6 @@
 from jnpr.junos.ofacts.personality import facts_personality as personality
 
 
-
 class TestPersonality(unittest.TestCase):
     @patch("jnpr.junos.device.warnings")
     def setUp(self, mock_warnings):

diff --git a/tests/unit/ofacts/test_routing_engines.py b/tests/unit/ofacts/test_routing_engines.py
@@ -14,7 +14,6 @@
 from ncclient.transport import SSHSession
 
 
-
 class TestRoutingEngines(unittest.TestCase):
     @patch("ncclient.manager.connect")
     @patch("jnpr.junos.device.warnings")

diff --git a/tests/unit/ofacts/test_srx_cluster.py b/tests/unit/ofacts/test_srx_cluster.py
@@ -13,7 +13,6 @@
 from ncclient.transport import SSHSession
 
 
-
 class TestSrxCluster(unittest.TestCase):
     @patch("ncclient.manager.connect")
     @patch("jnpr.junos.device.warnings")

diff --git a/tests/unit/ofacts/test_switch_style.py b/tests/unit/ofacts/test_switch_style.py
@@ -9,7 +9,6 @@
 from jnpr.junos.ofacts.switch_style import facts_switch_style as switch_style
 
 
-
 class TestSwitchStyle(unittest.TestCase):
     @patch("jnpr.junos.device.warnings")
     def setUp(self, mock_warnings):

diff --git a/tests/unit/ofacts/test_swver.py b/tests/unit/ofacts/test_swver.py
@@ -17,7 +17,6 @@
 from jnpr.junos.exception import RpcError
 
 
-
 class TestSwver(unittest.TestCase):
     @patch("ncclient.manager.connect")
     @patch("jnpr.junos.device.warnings")

diff --git a/tests/unit/test_decorators.py b/tests/unit/test_decorators.py
@@ -22,7 +22,6 @@
 __author__ = "Rick Sherman"
 
 
-
 class Test_Decorators(unittest.TestCase):
     @patch("ncclient.manager.connect")
     def setUp(self, mock_connect):

diff --git a/tests/unit/test_device.py b/tests/unit/test_device.py
@@ -53,7 +53,6 @@
 }
 
 
-
 class Test_MyTemplateLoader(unittest.TestCase):
     def setUp(self):
         from jnpr.junos.device import _MyTemplateLoader
@@ -475,7 +474,9 @@ def test_device_open_with_look_for_keys_False(self, mock_connect, mock_execute):
             """
             mock_connect.side_effect = self._mock_manager
             mock_execute.side_effect = self._mock_manager
-            self.dev2 = Device(host="2.2.2.2", user="test", password="password123", look_for_keys=False)
+            self.dev2 = Device(
+                host="2.2.2.2", user="test", password="password123", look_for_keys=False
+            )
             self.dev2.open()
             self.assertEqual(self.dev2.connected, True)
 
@@ -490,7 +491,9 @@ def test_device_open_with_look_for_keys_True(self, mock_connect, mock_execute):
             """
             mock_connect.side_effect = self._mock_manager
             mock_execute.side_effect = self._mock_manager
-            self.dev2 = Device(host="2.2.2.2", user="test", password="password123", look_for_keys=True)
+            self.dev2 = Device(
+                host="2.2.2.2", user="test", password="password123", look_for_keys=True
+            )
             self.dev2.open()
             self.assertEqual(self.dev2.connected, True)
 

diff --git a/tests/unit/test_exception.py b/tests/unit/test_exception.py
@@ -81,7 +81,6 @@
 }"""
 
 
-
 class Test_RpcError(unittest.TestCase):
     def test_rpcerror_repr(self):
         rsp = etree.XML(rpc_xml)

diff --git a/tests/unit/test_factcache.py b/tests/unit/test_factcache.py
@@ -15,7 +15,6 @@
 __credits__ = "Jeremy Schulman, Nitin Kumar"
 
 
-
 class TestFactCache(unittest.TestCase):
     @patch("ncclient.manager.connect")
     def setUp(self, mock_connect):

diff --git a/tests/unit/test_junos.py b/tests/unit/test_junos.py
@@ -10,7 +10,6 @@
 __credits__ = "Jeremy Schulman"
 
 
-
 class TestJunosInit(unittest.TestCase):
     def test_warning(self):
         print(sys.modules["sys"].version_info)
-Original file line number
+Diff line change
@@ Expand Up / @@ -81,7 +81,6 @@ @@
     }"""
     class Test_RpcError(unittest.TestCase):
         def test_rpcerror_repr(self):
             rsp = etree.XML(rpc_xml)
@@ Expand Down @@