Reformat codebase using ruff v0.11.9

Author: johannaengland

python/nav/Snmp/__init__.py

@@ -20,6 +20,7 @@
 multiple implementations
 
 """
+
 import os
 import sys
 

python/nav/Snmp/defines.py

@@ -14,6 +14,7 @@
 # License along with NAV. If not, see <http://www.gnu.org/licenses/>.
 #
 """Defines types and enumerations for SNMP communication parameters"""
+
 from enum import Enum
 
 

python/nav/Snmp/profile.py

@@ -14,6 +14,7 @@
 # License along with NAV. If not, see <http://www.gnu.org/licenses/>.
 #
 """Helper functions to build SNMP sessions from NAV ManagementProfile instances"""
+
 from functools import partial
 from typing import Callable
 

python/nav/Snmp/pynetsnmp.py

@@ -16,7 +16,6 @@
 #
 """High level synchronouse NAV API for NetSNMP"""
 
-
 from collections import namedtuple
 from ctypes import (
     c_int,

python/nav/__init__.py

@@ -16,6 +16,7 @@
 """
 Provides a common root package for the NAV python library.
 """
+
 import time
 import warnings
 

python/nav/activeipcollector/manager.py

@@ -16,6 +16,7 @@
 # License along with NAV. If not, see <http://www.gnu.org/licenses/>.
 #
 """Manage collection and storing of active ip-addresses statistics"""
+
 import datetime
 import logging
 import time

python/nav/alertengine/base.py

@@ -18,7 +18,6 @@
 #
 """Alertengine base functionality"""
 
-
 import gc
 import logging
 from datetime import datetime, timedelta
@@ -420,7 +419,7 @@ def process_single_queued_notification(queued_alert, now):
 
     if subscription is None:
         _logger.info(
-            'Sending alert %d right away as the users profile has ' 'been disabled',
+            'Sending alert %d right away as the users profile has been disabled',
             queued_alert.alert_id,
         )
         send = True
@@ -444,7 +443,7 @@ def process_single_queued_notification(queued_alert, now):
 
     else:
         _logger.error(
-            'Account %s has an invalid subscription type in ' 'subscription %d',
+            'Account %s has an invalid subscription type in subscription %d',
             subscription.account,
             subscription.id,
         )
@@ -484,7 +483,7 @@ def _verify_daily_dispatch(queued_alert, now, _logger=_logger):
         now.date(), daily_time
     )
     _logger.debug(
-        'Tests: last sent %s, daily time %s, insertion time ' '%s',
+        'Tests: last sent %s, daily time %s, insertion time %s',
         last_sent_test,
         daily_time_test,
         insertion_time_test,
@@ -512,7 +511,7 @@ def _verify_weekly_dispatch(queued_alert, now, _logger=_logger):
     )
 
     _logger.debug(
-        'Tests: weekday %s, last sent %s, weekly time %s, ' 'insertion time %s',
+        'Tests: weekday %s, last sent %s, weekly time %s, insertion time %s',
         weekday_test,
         last_sent_test,
         weekly_time_test,

python/nav/alertengine/dispatchers/email_dispatcher.py

@@ -61,7 +61,7 @@ def send(self, address, alert, language='en'):
                 email.send(fail_silently=False)
             else:
                 _logger.debug(
-                    'alert %d: In testing mode, would have sent ' 'email to %s',
+                    'alert %d: In testing mode, would have sent email to %s',
                     alert.id,
                     address.address,
                 )

python/nav/arnold.py

@@ -19,7 +19,6 @@
 Provides helpfunctions for Arnold web and script
 """
 
-
 import re
 import os
 import configparser

python/nav/asyncdns.py

@@ -24,7 +24,6 @@
 
 """
 
-
 import socket
 from itertools import cycle
 from collections import defaultdict

python/nav/auditlog/models.py

@@ -82,7 +82,7 @@ def add_log_entry(
         self = cls()
         dict = {'actor': actor, 'object': object, 'target': target}
         for k, v in dict.items():
-            dict[k] = getattr(v, 'audit_logname', u'%s' % v)
+            dict[k] = getattr(v, 'audit_logname', '%s' % v)
         try:
             self.summary = template.format(**dict)
         except KeyError as error:
@@ -111,8 +111,8 @@ def add_create_entry(actor, obj):
         model = obj.__class__.__name__.lower()
         LogEntry.add_log_entry(
             actor,
-            u'create-{}'.format(model),
-            u'{actor} created {object}',
+            'create-{}'.format(model),
+            '{actor} created {object}',
             after=obj,
             object=obj,
         )
@@ -121,9 +121,9 @@ def add_create_entry(actor, obj):
     def add_delete_entry(actor, obj, template=None):
         """Add log entry for deleted objects"""
         model = obj.__class__.__name__.lower()
-        template = template or u'{actor} deleted {object}'
+        template = template or '{actor} deleted {object}'
         LogEntry.add_log_entry(
-            actor, u'delete-{}'.format(model), template, before=obj, object=obj
+            actor, 'delete-{}'.format(model), template, before=obj, object=obj
         )
 
     @staticmethod
@@ -137,10 +137,10 @@ def dict_to_string(d):
             """
             {"a": "b", "c": "d"} => "a=b, c=d"
             """
-            return u", ".join(u"{}={}".format(x, y) for x, y in d.items())
+            return ", ".join("{}={}".format(x, y) for x, y in d.items())
 
         model = new.__class__.__name__.lower()
-        prefix = u'{actor} edited {object}'
+        prefix = '{actor} edited {object}'
         old_value = getattr(old, attribute)
         new_value = getattr(new, attribute)
         if include_values:
@@ -149,16 +149,16 @@ def dict_to_string(d):
                 old_value = dict_to_string(old_value)
             if isinstance(new_value, dict):
                 new_value = dict_to_string(new_value)
-            summary = u"{} changed from '{}' to '{}'".format(
+            summary = "{} changed from '{}' to '{}'".format(
                 attribute, old_value, new_value
             )
         else:
-            summary = u"{} changed".format(attribute)
+            summary = "{} changed".format(attribute)
 
         LogEntry.add_log_entry(
             actor,
-            u'edit-{}-{}'.format(model, attribute),
-            u'{}: {}'.format(prefix, summary),
+            'edit-{}-{}'.format(model, attribute),
+            '{}: {}'.format(prefix, summary),
             before=old,
             after=new,
             object=new,

python/nav/auditlog/utils.py

@@ -36,7 +36,7 @@ def get_auditlog_entries(
     Limit results to <pks>, <queryset> and/or <subsystem>
     """
     assert modelname or queryset, (
-        "At least one of <modelname> or " "<queryset> must be given"
+        "At least one of <modelname> or <queryset> must be given"
     )
     if pks is None:
         pks = []

python/nav/bin/alertengine.py

@@ -154,7 +154,7 @@ def main():
 
         except DatabaseError as err:
             _logger.error(
-                'Database error, closing the DB connection just in ' 'case:\n%s', err
+                'Database error, closing the DB connection just in case:\n%s', err
             )
             _logger.debug('', exc_info=True)
             if connection.queries:
@@ -233,7 +233,7 @@ def loginitsmtp(loglevel, mailaddr, fromaddr, mailserver):
             mailserver, fromaddr, mailaddr, 'NAV alertengine warning from ' + hostname
         )
         mailformat = (
-            '[%(asctime)s] [%(levelname)s] [pid=%(process)d %(name)s] ' '%(message)s'
+            '[%(asctime)s] [%(levelname)s] [pid=%(process)d %(name)s] %(message)s'
         )
         mailformatter = logging.Formatter(mailformat)
         mailhandler.setFormatter(mailformatter)

python/nav/bin/collect_active_ip.py

@@ -17,7 +17,6 @@
 #
 """A wrapper for prefix_ip_collector"""
 
-
 import argparse
 import logging
 import time

python/nav/bin/macwatch.py

@@ -41,7 +41,7 @@
 
 # Occurences of the mac-address nearest to the edges has highest
 # priority
-LOCATION_PRIORITY = {u'GSW': 1, u'GW': 1, u'SW': 2, u'EDGE': 3}
+LOCATION_PRIORITY = {'GSW': 1, 'GW': 1, 'SW': 2, 'EDGE': 3}
 
 
 def prioritize_location(cam_objects):
@@ -175,7 +175,7 @@ def main():
                 # continue with next mac if not.
                 if len(macwatch_matches) == 1:
                     _logger.info(
-                        "Mac-address is active, but have not moved " "since last check"
+                        "Mac-address is active, but have not moved since last check"
                     )
                     continue
 
@@ -205,7 +205,7 @@ def main():
                     )
                     new_macwatch_match.save()
                 else:
-                    _logger.warning("Failed to post event, no alert will be " "given.")
+                    _logger.warning("Failed to post event, no alert will be given.")
 
     _logger.info(
         "--> Done checking for macs in %.3f seconds <--", time.time() - start_time

python/nav/bin/mailin.py

@@ -131,7 +131,7 @@ def add_mailin_subsystem():
 
     cursor.execute("select * from subsystem where name='mailin'")
     if cursor.rowcount == 0:
-        cursor.execute("INSERT INTO subsystem (name, descr) " "VALUES ('mailin', '')")
+        cursor.execute("INSERT INTO subsystem (name, descr) VALUES ('mailin', '')")
     conn.commit()
 
 

python/nav/bin/maintengine.py

@@ -20,7 +20,6 @@
 schedule in NAVdb.
 """
 
-
 import time
 import logging
 

python/nav/bin/navcheckservice.py

@@ -22,7 +22,6 @@
 
 """
 
-
 import argparse
 import sys
 

python/nav/bin/navclean.py

@@ -19,6 +19,7 @@
 # along with NAV. If not, see <http://www.gnu.org/licenses/>.
 #
 """Cleans old data from the NAV database"""
+
 import argparse
 import sys
 

python/nav/bin/navdf.py

@@ -18,7 +18,6 @@
 A command line interface to list and filter IP devices monitored by NAV
 """
 
-
 import argparse
 
 from nav.bootstrap import bootstrap_django

python/nav/bin/navdump.py

@@ -112,7 +112,7 @@ def parse_args():
     args = parser.parse_args()
     if not (args.table or args.all):
         parser.error(
-            "Please specify which tables to dump, using either " "--table or --all"
+            "Please specify which tables to dump, using either --table or --all"
         )
     return args
 
@@ -128,13 +128,13 @@ def fail(resultcode, msg):
 
 def header(definition):
     """Output the header definition, possibly with replaced separators"""
-    definition = definition.replace(u":", SEPARATOR) + u'\n'
+    definition = definition.replace(":", SEPARATOR) + '\n'
     sys.stdout.write(definition)
 
 
 def lineout(line):
     """Output line, remove any : in strings"""
-    newline = (u'"%s"' % column if SEPARATOR in column else column for column in line)
+    newline = ('"%s"' % column if SEPARATOR in column else column for column in line)
     line = SEPARATOR.join(newline) + '\n'
     sys.stdout.write(line)
 
@@ -151,8 +151,8 @@ def netbox():
             "devicegroup1:devicegroup2..]"
         )
         for box in manage.Netbox.objects.all():
-            profiles = u'|'.join(box.profiles.values_list('name', flat=True))
-            data = u'|'.join(u"%s=%s" % (k, v) for k, v in box.data.items())
+            profiles = '|'.join(box.profiles.values_list('name', flat=True))
+            data = '|'.join("%s=%s" % (k, v) for k, v in box.data.items())
             line = [
                 box.room_id,
                 box.ip,

python/nav/bin/naventity.py

@@ -20,7 +20,6 @@
 ENTITY-MIB::entPhysicalTable.
 """
 
-
 import sys
 import argparse
 

python/nav/bin/navmain.py

@@ -16,6 +16,7 @@
 # License along with NAV. If not, see <http://www.gnu.org/licenses/>.
 #
 """Command line program to control NAV processes"""
+
 import sys
 import os
 import os.path
@@ -102,7 +103,7 @@ def _add_bespoke_subparsers(subparsers):
     config_sub = config.add_subparsers()
     where = config_sub.add_parser(
         "where",
-        help="find and report the location of the " "main NAV configuration file",
+        help="find and report the location of the main NAV configuration file",
     )
     where.set_defaults(func=command_config_where)
 
@@ -121,12 +122,12 @@ def _add_bespoke_subparsers(subparsers):
         "directory",
     )
     install.add_argument(
-        'target_directory', help="the directory in which to install the config " "files"
+        'target_directory', help="the directory in which to install the config files"
     )
     install.add_argument(
         '--overwrite',
         action="store_true",
-        help="overwrite existing config files in target " "directory",
+        help="overwrite existing config files in target directory",
     )
     install.add_argument(
         '--verbose',
@@ -300,8 +301,9 @@ def command_config_where(_args):
         print(path)
     else:
         sys.exit(
-            "Could not find nav.conf in any of these locations:\n"
-            "{}".format('\n'.join(CONFIG_LOCATIONS))
+            "Could not find nav.conf in any of these locations:\n{}".format(
+                '\n'.join(CONFIG_LOCATIONS)
+            )
         )
 
 

python/nav/bin/navoidverify.py

@@ -21,7 +21,6 @@
 NAV-monitored devices.
 """
 
-
 import platform
 import sys
 from itertools import cycle

python/nav/bin/navsnmp.py

@@ -18,6 +18,7 @@
 line arguments.
 
 """
+
 import argparse
 import sys
 

python/nav/bin/navsynctypes.py

@@ -18,6 +18,7 @@
 to synchronize the IP Device type registry of one NAV installation based on the
 information contained in another.
 """
+
 import argparse
 
 import nav.db