Let ruff fix 25 lint errors in the bin folder scripts as pointed out by

`make lint-python LINT_ENFORCE_DIRS=bin`
One manual fix of the last one to avoid using plain `except:` as well.

Author: jonasbardino

mig/server/checkcloud.py

@@ -31,7 +31,6 @@
 from __future__ import absolute_import
 
 import getopt
-import pickle
 import sys
 
 from mig.shared.defaults import keyword_all

mig/server/checktwofactor.py

@@ -31,7 +31,6 @@
 from __future__ import absolute_import
 
 import getopt
-import pickle
 import sys
 
 from mig.shared.defaults import keyword_auto

mig/server/createuser.py

@@ -36,7 +36,6 @@
 import getopt
 import os
 import sys
-import time
 
 from mig.shared.accountstate import default_account_expire
 from mig.shared.base import fill_distinguished_name, fill_user, canonical_user, \

mig/server/importusers.py

@@ -35,7 +35,6 @@
 import re
 import ssl
 import sys
-import time
 
 from mig.shared import returnvalues
 from mig.shared.accountstate import default_account_expire
@@ -46,9 +45,7 @@
 from mig.shared.functionality.sendrequestaction import main
 from mig.shared.handlers import get_csrf_limit, make_csrf_token
 from mig.shared.output import format_output
-from mig.shared.pwcrypto import generate_random_password, unscramble_password, \
-    scramble_password
-from mig.shared.safeinput import valid_password_chars
+from mig.shared.pwcrypto import generate_random_password, scramble_password
 from mig.shared.url import urlopen
 from mig.shared.useradm import init_user_adm, default_search, create_user, \
     search_users

mig/server/managecloud.py

@@ -33,7 +33,6 @@
 from __future__ import absolute_import
 
 import getopt
-import pickle
 import sys
 
 from mig.shared.defaults import keyword_all
@@ -105,7 +104,7 @@ def usage(name='managecloud.py'):
     action_map = {'start': start_cloud_instance, 'stop': stop_cloud_instance,
                   'restart': restart_cloud_instance,
                   'status': status_of_cloud_instance}
-    if not action in action_map:
+    if action not in action_map:
         print('Error: action must be one of %s' % action_map.keys())
         usage()
         sys.exit(1)
@@ -142,7 +141,7 @@ def usage(name='managecloud.py'):
                 list(saved_instances), instance_fields)
             action_helper = action_map[action]
             for (instance_id, instance_dict) in saved_instances.items():
-                if not instance_id in instance_list:
+                if instance_id not in instance_list:
                     continue
                 instance_label = instance_dict.get('INSTANCE_LABEL',
                                                    instance_id)

mig/server/notifyexpire.py

@@ -201,7 +201,7 @@ def usage(name='notifyexpire.py'):
 
         # Don't warn about already disabled or suspended accounts
         account_state = user_dict.get('status', 'active')
-        if not account_state in ('active', 'temporal'):
+        if account_state not in ('active', 'temporal'):
             if verbose:
                 print('Skip handling of already %s user %s' % (account_state,
                                                                user_id))
@@ -322,7 +322,7 @@ def usage(name='notifyexpire.py'):
                                   (cloud_title, instance_id, user_id))
                         continue
                     else:
-                        if not 'cloud' in affected:
+                        if 'cloud' not in affected:
                             affected.append('cloud')
 
         (_, username, full_name, addresses, errors) = user_account_notify(

mig/server/reqacceptpeer.py

@@ -41,12 +41,11 @@
 import sys
 
 from mig.shared.accountreq import peers_permit_allowed, manage_pending_peers
-from mig.shared.base import fill_distinguished_name, client_id_dir
+from mig.shared.base import fill_distinguished_name
 from mig.shared.conf import get_configuration_object
-from mig.shared.defaults import keyword_auto, gdp_distinguished_field, \
-    pending_peers_filename
+from mig.shared.defaults import keyword_auto, gdp_distinguished_field
 from mig.shared.notification import notify_user
-from mig.shared.serial import load, dump
+from mig.shared.serial import load
 from mig.shared.useradm import init_user_adm, search_users, default_search, \
     user_account_notify
 from mig.shared.validstring import valid_email_addresses

mig/server/reset2fakey.py

@@ -85,7 +85,7 @@ def enable2fa(configuration, user_id, verbose, force=False):
 
     try:
         os.remove(tmptopicfile)
-    except Exception as exc:
+    except Exception:
         pass  # probably deleted by parser!
 
     return parse_status
@@ -251,7 +251,7 @@ def usage(name='reset2fakey.py'):
             print("Detected HEX seed, re-encoding to base32")
         try:
             seed = base64.b32encode(base64.b16decode(seed))
-        except Exception as exc:
+        except Exception:
             print("Failed to base32 encode seed")
             if not force:
                 sys.exit(1)
@@ -263,7 +263,7 @@ def usage(name='reset2fakey.py'):
     if interval:
         try:
             interval = int(interval)
-        except:
+        except Exception:
             print("Skipping non-int interval: %s" % interval)
             interval = None
 

mig/server/resetcaches.py

@@ -33,7 +33,6 @@
 import sys
 
 
-from mig.shared.base import client_id_dir
 from mig.shared.conf import get_configuration_object
 from mig.shared.fileio import delete_file
 from mig.shared.vgridaccess import refresh_vgrid_map, refresh_user_map, \

mig/server/searchusers.py

@@ -33,7 +33,6 @@
 from past.builtins import basestring
 import getopt
 import sys
-import time
 
 from mig.shared.useradm import init_user_adm, search_users, default_search