Remove six from ipdevpoll

python/nav/ipdevpoll/log.py

@@ -1,5 +1,6 @@
 #
 # Copyright (C) 2008-2012 Uninett AS
+# Copyright (C) 2022 Sikt
 #
 # This file is part of Network Administration Visualized (NAV).
 #
@@ -20,8 +21,6 @@
 import inspect
 from itertools import islice
 
-import six
-
 
 class ContextFormatter(Formatter):
     """A log formatter that will add context data if available in the record.
@@ -61,17 +60,9 @@ def _set_context(self, record):
         else:
             self._set_format(self._normal_fmt)
 
-    if six.PY3:
-        # Under Python >= 3 we must also set the internal style's format, since
-        # formatting is actually delegated to the style object
-        def _set_format(self, fmt):
-            self._fmt = fmt
-            self._style._fmt = fmt
-
-    else:
-
-        def _set_format(self, fmt):
-            self._fmt = fmt
+    def _set_format(self, fmt):
+        self._fmt = fmt
+        self._style._fmt = fmt
 
     def _strip_logger_prefix(self, record):
         if record.name.startswith(self.prefix):

python/nav/ipdevpoll/neighbor.py

@@ -1,5 +1,6 @@
 #
 # Copyright (C) 2012 Uninett AS
+# Copyright (C) 2022 Sikt
 #
 # This file is part of Network Administration Visualized (NAV).
 #
@@ -28,7 +29,6 @@
 
 from IPy import IP
 from django.db.models import Q
-import six
 
 from nav.util import cachedfor, synchronized
 from nav.models import manage
@@ -151,7 +151,7 @@ def _netbox_from_ip(self, ip):
 
         """
         try:
-            ip = six.text_type(IP(ip))
+            ip = str(IP(ip))
         except ValueError:
             self._logger.warning(
                 "Invalid IP (%s) in neighbor record: %r", ip, self.record

python/nav/ipdevpoll/plugins/cdp.py

@@ -1,5 +1,6 @@
 #
 # Copyright (C) 2012 Uninett AS
+# Copyright (C) 2022 Sikt
 #
 # This file is part of Network Administration Visualized (NAV).
 #
@@ -16,7 +17,6 @@
 "ipdevpoll plugin to collect CDP (Cisco Discovery Protocol) information"
 import string
 
-import six
 from twisted.internet import defer
 
 from nav.macaddress import MacAddress
@@ -173,11 +173,11 @@ def _store_unidentified(self, record):
         ifc = self.containers.factory(record.ifindex, shadows.Interface)
         ifc.ifindex = record.ifindex
 
-        key = (record.ifindex, six.text_type(record.ip), SOURCE)
+        key = (record.ifindex, str(record.ip), SOURCE)
         neighbor = self.containers.factory(key, shadows.UnrecognizedNeighbor)
         neighbor.netbox = self.netbox
         neighbor.interface = ifc
-        neighbor.remote_id = six.text_type(record.ip)
+        neighbor.remote_id = str(record.ip)
         neighbor.remote_name = record.deviceid
         neighbor.source = SOURCE
 

python/nav/ipdevpoll/plugins/entity.py

@@ -1,5 +1,6 @@
 #
 # Copyright (C) 2009-2012, 2015 Uninett AS
+# Copyright (C) 2022 Sikt
 #
 # This file is part of Network Administration Visualized (NAV).
 #
@@ -17,7 +18,6 @@
 ipdevpoll plugin to collect information about physical entities, if any,
 within a Netbox, from the ENTITY-MIB::entPhysicalTable (RFC 4133 and RFC 6933)
 """
-import six
 from twisted.internet import defer
 
 from nav.Snmp import safestring
@@ -74,7 +74,7 @@ def _fix_hierarchy(self, containers):
         ghosts = set()
         for container in containers:
             if container.contained_in:
-                parent_id = six.text_type(container.contained_in)
+                parent_id = str(container.contained_in)
                 parent = by_index.get(parent_id)
                 if parent:
                     container.contained_in = parent

python/nav/ipdevpoll/plugins/lldp.py

@@ -1,5 +1,6 @@
 #
 # Copyright (C) 2012 Uninett AS
+# Copyright (C) 2022 Sikt
 #
 # This file is part of Network Administration Visualized (NAV).
 #
@@ -17,7 +18,6 @@
 from pprint import pformat
 
 from django.db.models import Q
-import six
 from twisted.internet import defer
 
 from nav.models import manage
@@ -294,7 +294,7 @@ def _interfaces_from_mac(self, mac):
         return self._interface_query(Q(ifphysaddress=mac))
 
     def _interfaces_from_ip(self, ip):
-        ip = six.text_type(ip)
+        ip = str(ip)
         assert ip
         if ip in self._invalid_neighbor_ips:
             return

python/nav/ipdevpoll/plugins/statmulticast.py

@@ -1,5 +1,6 @@
 #
 # Copyright (C) 2014 Uninett AS
+# Copyright (C) 2022 Sikt
 #
 # This file is part of Network Administration Visualized (NAV).
 #
@@ -19,7 +20,6 @@
 from collections import Counter
 from pprint import pformat
 
-from six import iteritems
 from twisted.internet import defer
 
 from nav.ipdevpoll import Plugin
@@ -70,5 +70,5 @@ def _make_metrics_from_counts(self, count_report, timestamp=None):
         timestamp = timestamp or time.time()
         return [
             (metric_path_for_multicast_usage(group, self.netbox), (timestamp, count))
-            for group, count in iteritems(count_report)
+            for group, count in count_report.items()
         ]

python/nav/ipdevpoll/plugins/statports.py

@@ -1,5 +1,6 @@
 #
 # Copyright (C) 2013 Uninett AS
+# Copyright (C) 2022 Sikt
 #
 # This file is part of Network Administration Visualized (NAV).
 #
@@ -17,7 +18,6 @@
 import time
 import logging
 
-from six import itervalues
 from twisted.internet import defer
 from nav.ipdevpoll import Plugin
 from nav.ipdevpoll import db
@@ -111,7 +111,7 @@ def _make_metrics(self, stats, netboxes, timestamp=None):
         timestamp = timestamp or time.time()
         hc_counters = False
 
-        for row in itervalues(stats):
+        for row in stats.values():
             hc_counters = use_hc_counters(row) or hc_counters
             for key in LOGGED_COUNTERS:
                 if key not in row:

python/nav/ipdevpoll/plugins/statsensors.py

@@ -1,5 +1,6 @@
 #
 # Copyright (C) 2013 Uninett AS
+# Copyright (C) 2022 Sikt
 #
 # This file is part of Network Administration Visualized (NAV).
 #
@@ -18,7 +19,6 @@
 import time
 
 from twisted.internet import defer
-import six
 
 from nav.Snmp import safestring
 from nav.ipdevpoll import Plugin
@@ -79,15 +79,13 @@ def _response_to_metrics(self, result, sensors, netboxes):
         metrics = []
         timestamp = time.time()
         data = (
-            (sensors[oid], value)
-            for oid, value in six.iteritems(result)
-            if oid in sensors
+            (sensors[oid], value) for oid, value in result.items() if oid in sensors
         )
         for sensor, value in data:
             # Attempt to support numbers-as-text values
-            if isinstance(value, six.binary_type):
+            if isinstance(value, bytes):
                 value = safestring(value)
-            if isinstance(value, six.text_type):
+            if isinstance(value, str):
                 try:
                     value = float(value)
                 except ValueError:

python/nav/ipdevpoll/pool.py

@@ -1,5 +1,6 @@
 #
 # Copyright (C) 2017, 2020 Uninett AS
+# Copyright (C) 2022 Sikt
 #
 # This file is part of Network Administration Visualized (NAV).
 #
@@ -28,8 +29,6 @@
 from twisted.internet.endpoints import ProcessEndpoint, StandardIOEndpoint
 import twisted.internet.endpoints
 
-import six
-
 from nav.ipdevpoll.config import ipdevpoll_conf
 from . import control, jobs
 
@@ -448,7 +447,7 @@ class HackLog(object):
     @staticmethod
     def msg(data, **_kwargs):
         """Logs a message to STDERR"""
-        if six.PY3 and isinstance(data, six.binary_type):
+        if isinstance(data, bytes):
             data = data.decode("utf-8")
         sys.stderr.write(data)
         sys.stderr.flush()

python/nav/ipdevpoll/schedule.py

@@ -1,5 +1,6 @@
 #
 # Copyright (C) 2008-2012 Uninett AS
+# Copyright (C) 2022 Sikt
 #
 # This file is part of Network Administration Visualized (NAV).
 #
@@ -29,8 +30,6 @@
 from twisted.internet.task import LoopingCall
 from twisted.python.log import err
 
-from six import iteritems
-
 from nav import ipdevpoll
 from nav.ipdevpoll import db
 from nav.ipdevpoll.snmp import SnmpError, AgentProxy
@@ -537,7 +536,7 @@ def flush(self):
         _logger.debug("flushing %d counters to graphite", len(self))
         metrics = []
         timestamp = time.time()
-        for counter, count in iteritems(self):
+        for counter, count in self.items():
             metrics.append((counter, (timestamp, count)))
             self[counter] = 0
 

python/nav/ipdevpoll/shadows/adjacency.py

@@ -1,5 +1,6 @@
 #
 # Copyright (C) 2012 Uninett AS
+# Copyright (C) 2022 Sikt
 #
 # This file is part of Network Administration Visualized (NAV).
 #
@@ -42,8 +43,6 @@
 interface attribute is None, and whose source attribute is a non-empty string.
 
 """
-import six
-
 from nav.models import manage
 from nav.ipdevpoll.storage import Shadow, DefaultManager
 from nav.ipdevpoll.utils import is_invalid_database_string
@@ -227,7 +226,7 @@ def prepare(self, _=None):
                 setattr(self, attr, repr(getattr(self, attr)))
             elif not getattr(self, attr):
                 setattr(self, attr, '')
-            elif not isinstance(getattr(self, attr), six.text_type):
+            elif not isinstance(getattr(self, attr), str):
                 value = getattr(self, attr)
                 setattr(self, attr, value.decode('utf-8'))
 

python/nav/ipdevpoll/shadows/entity.py

@@ -24,8 +24,6 @@
 from networkx.algorithms.traversal.depth_first_search import dfs_tree as subtree
 
 from django.db import transaction
-import six
-from six import iteritems, itervalues
 
 from nav.toposort import build_graph, topological_sort
 
@@ -215,7 +213,7 @@ def __init__(self, *args, **kwargs):
 
     def __setattr__(self, key, value):
         if key == 'index' and value is not None:
-            value = six.text_type(value)
+            value = str(value)
         if key == 'contained_in' and value == 0:
             value = None
         super(NetboxEntity, self).__setattr__(key, value)
@@ -239,7 +237,7 @@ def get_chassis_entities(cls, containers):
         :type containers: nav.ipdevpoll.storage.ContainerRepository
         """
         if cls in containers:
-            entities = itervalues(containers[cls])
+            entities = containers[cls].values()
             return [
                 e
                 for e in entities
@@ -255,7 +253,7 @@ def get_root_entities(cls, containers):
         :type containers: nav.ipdevpoll.storage.ContainerRepository
         """
         if cls in containers:
-            entities = itervalues(containers[cls])
+            entities = containers[cls].values()
             return [
                 e for e in entities if e.contained_in is None or e.contained_in == -1
             ]
@@ -310,7 +308,7 @@ def index_by_serial(self):
         for ent in self.entities:
             if ent.device and ent.device.serial:
                 by_serial[(ent.source, ent.device.serial)].append(ent)
-        by_serial = {k: v[0] for k, v in iteritems(by_serial) if len(v) == 1}
+        by_serial = {k: v[0] for k, v in by_serial.items() if len(v) == 1}
         return by_serial
 
     def index_by_name(self):
@@ -322,5 +320,5 @@ def index_by_name(self):
         for ent in self.entities:
             if ent.name:
                 by_name[(ent.source, ent.name)].append(ent)
-        by_name = {k: v[0] for k, v in iteritems(by_name) if len(v) == 1}
+        by_name = {k: v[0] for k, v in by_name.items() if len(v) == 1}
         return by_name

python/nav/ipdevpoll/shadows/interface.py

@@ -1,5 +1,6 @@
 #
 # Copyright (C) 2009-2012 Uninett AS
+# Copyright (C) 2022 Sikt
 #
 # This file is part of Network Administration Visualized (NAV).
 #
@@ -20,7 +21,6 @@
 
 from django.db.models import Q
 from django.db import transaction
-import six
 
 from nav.models import manage
 from nav.models.event import EventQueue as Event, EventQueueVar as EventVar
@@ -403,7 +403,7 @@ def _strip_null_bytes(self, containers):
         """
         for field in 'ifname', 'ifdescr', 'ifalias':
             value = getattr(self, field, None)
-            if isinstance(value, six.text_type) and "\x00" in value:
+            if isinstance(value, str) and "\x00" in value:
                 value = value.replace("\x00", "")
                 setattr(self, field, value)