File no-six.patch of Package python-junos-eznc

Overview Repositories Revisions Requests Users Attributes Meta

File no-six.patch of Package python-junos-eznc (Revision 2a02ccbe94019fb6d9dc6362fb4ecc39)

Currently displaying revision 2a02ccbe94019fb6d9dc6362fb4ecc39 , Show latest

Index: py-junos-eznc-2.7.1/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
@@ -1,7 +1,6 @@
 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):
 
 
 # xslt to remove prefix like junos:ns
-strip_namespaces_prefix = six.b(
-    """<?xml version="1.0" encoding="UTF-8" ?>
+strip_namespaces_prefix = b"""<?xml version="1.0" encoding="UTF-8" ?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:output method="xml" indent="no" omit-xml-declaration="no" />
 
@@ -249,4 +247,3 @@ strip_namespaces_prefix = six.b(
         </xsl:attribute>
     </xsl:template>
 </xsl:stylesheet>"""
-)
Index: py-junos-eznc-2.7.1/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
@@ -11,23 +11,22 @@ from lxml.etree import XMLSyntaxError
 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
 
 
 class PY6:
-    NEW_LINE = six.b("\n")
-    EMPTY_STR = six.b("")
-    NETCONF_EOM = six.b("]]>]]>")
-    STARTS_WITH = six.b(""
-            ),
-            six.b(""),
-            six.b(
-                """
+            b"",
+            b"",
+            b"""
 <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):
   </capabilities>
   <session-id>7478</session-id>
 </hello>
-]]>]]>"""
-            ),
-            six.b(""),
+]]>]]>""",
+            b"",
         ]
         self.dev.open()
 
@@ -144,7 +139,7 @@ class TestSerialWin(unittest.TestCase):
         self.dev._tty.read = MagicMock()
         self.dev._tty.rawwrite = MagicMock()
         self.dev._tty.read.side_effect = [
-            six.b(
+            bytes(
                 '<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):
                 "-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"
-                "ormation></rpc-reply>]]>]]>"
+                "ormation></rpc-reply>]]>]]>",
+                'utf-8'
             )
         ]
         res = self.dev.rpc.get_route_engine_information()
Index: py-junos-eznc-2.7.1/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
@@ -7,7 +7,6 @@ from unittest.mock import MagicMock, pat
 
 from jnpr.junos.transport.tty_netconf import tty_netconf
 
-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):
         mock_rcv.return_value = "]]>]]>"
-        self.tty_net._tty.read.return_value = six.b("testing")
+        self.tty_net._tty.read.return_value = b"testing"
         from datetime import timedelta
 
         mock_delta.return_value = timedelta(seconds=0.5)
@@ -56,7 +55,7 @@ class TestTTYNetconf(unittest.TestCase):
         mock_rcv.return_value = "]]>]]>"
         self.tty_net.rpc("get-interface-information")
         self.tty_net._tty.rawwrite.assert_called_with(
-            six.b("<rpc><get-interface-information/></rpc>")
+            b"<rpc><get-interface-information/></rpc>"
         )
 
     @patch("jnpr.junos.transport.tty_netconf.tty_netconf._receive")
@@ -103,7 +102,7 @@ class TestTTYNetconf(unittest.TestCase):
     @patch("jnpr.junos.transport.tty_netconf.select.select")
     def test_tty_netconf_receive_empty_line(self, mock_select):
         rx = MagicMock()
-        rx.read_until.side_effect = iter([six.b(""), six.b("]]>]]>")])
+        rx.read_until.side_effect = iter([b"", b"]]>]]>"])
         mock_select.return_value = ([rx], [], [])
         self.assertEqual(self.tty_net._receive().tag, "error-in-receive")
 
@@ -117,7 +116,7 @@ class TestTTYNetconf(unittest.TestCase):
     @patch("jnpr.junos.transport.tty_netconf.select.select")
     def test_tty_netconf_receive_splited_eom(self, mock_select):
         rx = MagicMock()
-        rx.read_until.side_effect = iter([six.b(i) for i in ["testing]", "]>", "]]>"]])
+        rx.read_until.side_effect = iter([i.encode('utf-8') for i in ["testing]", "]>", "]]>"]])
         mock_select.return_value = ([rx], [], [])
         self.assertEqual(self.tty_net._receive().tag, "error-in-receive")
 
@@ -126,30 +125,30 @@ class TestTTYNetconf(unittest.TestCase):
         rx = MagicMock()
 
         rx.read_until.side_effect = iter(
-            [six.b("<rpc-reply>ok<dummy></rpc-reply>"), six.b("\n]]>]]>")]
+            [b"<rpc-reply>ok<dummy></rpc-reply>", b"\n]]>]]>"]
         )
         mock_select.return_value = ([rx], [], [])
         self.assertEqual(
-            self.tty_net._receive(), six.b("<rpc-reply>ok<dummy/></rpc-reply>")
+            self.tty_net._receive(), b"<rpc-reply>ok<dummy/></rpc-reply>"
         )
 
     @patch("jnpr.junos.transport.tty_netconf.select.select")
     def test_tty_netconf_receive_XMLSyntaxError_eom_in_center(self, mock_select):
         rx = MagicMock()
         rx.read_until.side_effect = iter(
-            [six.b("<rpc-reply>ok</rpc-reply>"), six.b("]]>]]>\ndummy")]
+            [b"<rpc-reply>ok</rpc-reply>", b"]]>]]>\ndummy"]
         )
         mock_select.return_value = ([rx], [], [])
-        self.assertEqual(self.tty_net._receive(), six.b("<rpc-reply>ok</rpc-reply>"))
+        self.assertEqual(self.tty_net._receive(), b"<rpc-reply>ok</rpc-reply>")
 
     @patch("jnpr.junos.transport.tty_netconf.select.select")
     def test_tty_netconf_receive_xmn_error(self, mock_select):
         rx = MagicMock()
         rx.read_until.side_effect = iter(
             [
-                six.b("<message>ok</message>"),
-                six.b("\n</xnm:error>\n"),
-                six.b("]]>]]>\ndummy"),
+                b"<message>ok</message>",
+                b"\n</xnm:error>\n",
+                b"]]>]]>\ndummy",
             ]
         )
         mock_select.return_value = ([rx], [], [])
Index: py-junos-eznc-2.7.1/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
@@ -7,7 +7,6 @@ except ImportError:
 import nose2
 from unittest.mock import MagicMock, patch
 from jnpr.junos.transport.tty_telnet import Telnet
-import six
 
 
 class TestTTYTelnet(unittest.TestCase):
@@ -62,7 +61,7 @@ class TestTTYTelnet(unittest.TestCase):
         self.tel_conn._tn.expect.return_value = (
             None,
             None,
-            six.b("port already in use"),
+            b"port already in use",
         )
         self.assertRaises(RuntimeError, self.tel_conn._login_state_machine)
 
Index: py-junos-eznc-2.7.1/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
@@ -1,6 +1,5 @@
 # stdlib
 import os
-import six
 import types
 import platform
 import warnings
@@ -665,7 +664,7 @@ class _Connection(object):
         command = command.strip()
         # Get the equivalent RPC
         rpc = self.display_xml_rpc(command)
-        if isinstance(rpc, six.string_types):
+        if isinstance(rpc, str):
             # 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
===================================================================
--- 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
@@ -3,7 +3,6 @@ import re
 import datetime
 from jnpr.junos.utils.ssh_client import open_ssh_client
 import subprocess
-import six
 from threading import Thread
 import time
 
Index: py-junos-eznc-2.7.1/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
 jinja2>=2.7.1
 PyYAML>=5.1
-six
 pyserial
 yamlordereddictloader
 pyparsing
Index: py-junos-eznc-2.7.1/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
@@ -1,8 +1,6 @@
 __author__ = "Stacy Smith"
 __credits__ = "Jeremy Schulman, Nitin Kumar"
 
-import six
-
 try:
     import unittest2 as unittest
 except:
@@ -13,9 +11,6 @@ from jnpr.junos.facts.swver import versi
 
 
 class TestVersionInfo(unittest.TestCase):
-    if six.PY2:
-        assertCountEqual = unittest.TestCase.assertItemsEqual
-
     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
===================================================================
--- 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
@@ -1,5 +1,5 @@
 import sys
-from six import StringIO
+from io import StringIO
 from contextlib import contextmanager
 
 import unittest
Index: py-junos-eznc-2.7.1/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
@@ -1,7 +1,7 @@
 from __future__ import print_function
 import os
 import sys
-from six import StringIO
+from io import StringIO
 
 try:
     import unittest2 as unittest

Places

File no-six.patch of Package python-junos-eznc (Revision 2a02ccbe94019fb6d9dc6362fb4ecc39)

Places