Merge remote-tracking branch 'origin/master' into edge

ucphhpc · Nov 4, 2024 · 171b092 · 171b092
2 parents 4a1dd69 + 8c0a2b5
commit 171b092
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/mig/server/grid_cron.py b/mig/server/grid_cron.py
@@ -4,7 +4,7 @@
 # --- BEGIN_HEADER ---
 #
 # grid_cron - daemon to monitor user crontabs and trigger actions
-# Copyright (C) 2003-2023  The MiG Project lead by Brian Vinter
+# Copyright (C) 2003-2024  The MiG Project lead by Brian Vinter
 #
 # This file is part of MiG.
 #
@@ -203,10 +203,10 @@ def __init__(
     ):
         """Constructor"""
 
-        PatternMatchingEventHandler.__init__(self, patterns,
-                                             ignore_patterns,
-                                             ignore_directories,
-                                             case_sensitive)
+        PatternMatchingEventHandler.__init__(
+            self, patterns=patterns, ignore_patterns=ignore_patterns,
+            ignore_directories=ignore_directories,
+            case_sensitive=case_sensitive)
 
     def __update_crontab_monitor(
         self,
@@ -373,13 +373,13 @@ def __cron_err(configuration, client_id, msg):
     __cron_log(configuration, client_id, msg, 'error')
 
 
-def __cron_warn(configuration, client_id,  msg):
+def __cron_warn(configuration, client_id, msg):
     """Wrapper to send a single warning msg to client_id cron log"""
 
     __cron_log(configuration, client_id, msg, 'warning')
 
 
-def __cron_info(configuration, client_id,  msg):
+def __cron_info(configuration, client_id, msg):
     """Wrapper to send a single info msg to client_id cron log"""
 
     __cron_log(configuration, client_id, msg, 'info')

diff --git a/mig/shared/output.py b/mig/shared/output.py
@@ -364,7 +364,7 @@ def txt_format(configuration, ret_val, ret_msg, out_obj):
             header = [['ID', 'Path']]
             optional_cols = [('access', 'Access'), ('created', 'Created'),
                              ('active', 'Active'), ('owner', 'Owner'),
-                             ('invites', 'Invites'),  ('expire', 'Expire'),
+                             ('invites', 'Invites'), ('expire', 'Expire'),
                              ('single_file', 'Single file'),
                              ]
             content_keys = ['share_id', 'path']
@@ -2740,8 +2740,8 @@ def file_format(configuration, ret_val, ret_msg, out_obj):
             content_type = val
     if content_type in ('text/plain', 'text/html'):
         render_text, render_errors = True, True
-    _logger.debug("render output in file_format: %s (%s %s)" %
-                  (out_obj, render_text, render_errors))
+    #_logger.debug("render output in file_format: %s (%s %s)" %
+    #              (out_obj, render_text, render_errors))
     for entry in out_obj:
         if entry['object_type'] == 'file_output':
             for line in entry['lines']: