Remove the use of six

netconf_client/ncclient.py

@@ -3,10 +3,10 @@
 import logging
 import inspect
 from concurrent.futures import CancelledError, TimeoutError
-from six.moves.queue import Empty
-from lxml import etree
+from queue import Empty
+import time
 
-import six
+from lxml import etree
 
 from netconf_client.error import RpcError
 from netconf_client.rpc import (
@@ -26,16 +26,6 @@
     delete_config,
 )
 
-if six.PY3:
-    from time import monotonic
-
-    _get_current_timestamp = monotonic
-else:
-    from time import time
-
-    _get_current_timestamp = time
-
-
 # Defines the scope for netconf traces
 _logger = logging.getLogger("netconf_client.manager")
 
@@ -221,7 +211,7 @@ def _send_rpc(self, rpc_xml):
         (raw, ele) = (None, None)
         self._log_rpc_request(rpc_xml)
 
-        current_timestamp = _get_current_timestamp()
+        current_timestamp = time.monotonic()
         end_timestamp = current_timestamp + self.timeout
         try:
             f = self.session.send_rpc(rpc_xml)
@@ -236,7 +226,7 @@ def _send_rpc(self, rpc_xml):
                         self._log_rpc_response(raw)
                     return (raw, ele)
                 except TimeoutError:
-                    current_timestamp = _get_current_timestamp()
+                    current_timestamp = time.monotonic()
                     if current_timestamp >= end_timestamp:
                         raise
         except CancelledError:

netconf_client/session.py

@@ -1,7 +1,7 @@
 from threading import Thread
 from concurrent.futures import Future
+from queue import Queue, Empty
 
-from six.moves.queue import Queue, Empty
 from lxml import etree
 
 from netconf_client.parser import parse_messages

pyproject.toml

@@ -17,7 +17,6 @@ classifiers = [
 
 [tool.poetry.dependencies]
 python = "^3.6.2"
-six = "^1.16.0"
 lxml = "^4.6.3"
 paramiko = "^2.7.2"
 

test/test_manager.py

@@ -4,8 +4,9 @@
 import logging
 import re
 from unittest.mock import patch
+from queue import Empty
+
 from lxml import etree
-from six.moves.queue import Empty
 import pytest
 
 from netconf_client.ncclient import Manager, convert_filter, from_ele, to_ele

test/test_session.py

@@ -1,4 +1,5 @@
-from six.moves.queue import Queue
+from queue import Queue
+
 import pytest
 
 from common import RPC_ERROR_WITHOUT_MSG