Fix a few more references to expire/expiry on Peers page tabs and update

copyright header. Tested in deployment.

Minor style fixes from autopep8.

Author: jonasbardino

mig/shared/functionality/peers.py

@@ -4,7 +4,7 @@
 # --- BEGIN_HEADER ---
 #
 # peers - manage external collaboration partners, etc.
-# Copyright (C) 2003-2021  The MiG Project lead by Brian Vinter
+# Copyright (C) 2003-2025  The MiG Project by the Science HPC Center at UCPH
 #
 # This file is part of MiG.
 #
@@ -305,7 +305,7 @@ def main(client_id, user_arguments_dict):
 vouched for to get an account on %(site)s because they need it for a particular
 course/workshop, research project or for general long term collaboration with
 you. The site admins will use this information to accept account requests and
-extensions from your peers until the given time of expiry.
+extensions from your peers until the given end date.
 </p>
 <div class="peer_entries">
 '''
@@ -376,10 +376,10 @@ def main(client_id, user_arguments_dict):
 <div id="fields-tab">
 <p>
 You may enter your individual peers in the form fields below and assign a
-shared kind and account expiry time for all entries. Just leave the Action
-field to <em>Add</em> unless you want to <em>Update</em> or <em>Remove</em>
-existing peers. You are free to leave rows empty, but each field in a peer row
-MUST be filled for the row to be treated.
+shared kind and account end date for all entries. Just leave the Action field
+to <em>Add</em> unless you want to <em>Update</em> or <em>Remove</em> existing
+peers. You are free to leave rows empty, but each field in a peer row MUST be
+filled for the row to be treated.
 </p>
 <div class="enter-form form_container">
 %(form_prefix_html)s

mig/shared/output.py

@@ -1530,7 +1530,7 @@ def html_format(configuration, ret_val, ret_msg, out_obj):
         <th>State</th>
         <th>Kind</th>
         <th>Label</th>
-        <th>Expire</th>
+        <th>End Date</th>
         <th>Actions</th>
     </tr>
 </thead>
@@ -1903,7 +1903,7 @@ def html_format(configuration, ret_val, ret_msg, out_obj):
             skip_list = i.get('skip_list', [])
             optional_cols = [('access', 'Access'), ('created', 'Created'),
                              ('active', 'Active'), ('owner', 'Owner'),
-                             ('invites', 'Invites'),  ('expire', 'Expire'),
+                             ('invites', 'Invites'), ('expire', 'Expire'),
                              ('single_file', 'Single file'),
                              ]
             # IMPORTANT: AdBlock Plus hides elements with class sharelink(s)
@@ -2749,7 +2749,7 @@ 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)" %
+    # _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':
@@ -2816,7 +2816,7 @@ def format_output(
     """This is the public method that should be called from other scripts"""
 
     logger = configuration.logger
-    #logger.debug("format output to %s" % outputformat)
+    # logger.debug("format output to %s" % outputformat)
     valid_formats = get_valid_outputformats()
     (val_ret, val_msg) = validate(out_obj)
     if not val_ret:
@@ -2867,7 +2867,7 @@ def format_output(
     if not outputformat in ('txt', 'html', 'file'):
         out_obj = [i for i in out_obj if i['object_type'] != 'wsgi']
 
-    #logger.debug("%s formatting output" % outputformat)
+    # logger.debug("%s formatting output" % outputformat)
     try:
         # return eval('%s_format(configuration, ret_val, ret_msg, out_obj)' %
         #            outputformat)
@@ -2900,10 +2900,10 @@ def format_output(
 def format_timedelta(timedelta):
     """Formats timedelta as '[Years,] [days,] HH:MM:SS'"""
     years = timedelta.days // 365
-    days = timedelta.days - (years*365)
+    days = timedelta.days - (years * 365)
     hours = timedelta.seconds // 3600
-    minutes = (timedelta.seconds-(hours*3600)) // 60
-    seconds = timedelta.seconds - (hours*3600) - (minutes*60)
+    minutes = (timedelta.seconds - (hours * 3600)) // 60
+    seconds = timedelta.seconds - (hours * 3600) - (minutes * 60)
 
     hours_str = "%s" % hours
     if hours < 10: