rucio 37.5.0__tar.gz → 37.6.0__tar.gz

{rucio-37.5.0 → rucio-37.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rucio
-Version: 37.5.0
+Version: 37.6.0
 Summary: Rucio Package
 Home-page: https://rucio.cern.ch/
 Author: Rucio

{rucio-37.5.0 → rucio-37.6.0}/bin/rucio-abacus-account

@@ -27,7 +27,14 @@ def get_parser():
     """
     Returns the argparse parser.
     """
-    parser = argparse.ArgumentParser(description="The Abacus-Account daemon is responsible for updating account usages. It checks if there are new entries in the UpdatedAccountCounter table and updates the account counters in the AccountCounter table by adding or substrating the amount and size of files and recalculating the quotas.", epilog='''
+    description = (
+        "The Abacus-Account daemon is responsible for updating account usages. "
+        "It checks if there are new entries in the UpdatedAccountCounter table "
+        "and updates the account counters in the AccountCounter table by adding "
+        "or subtracting the amount and size of files and recalculating the quotas."
+    )
+
+    parser = argparse.ArgumentParser(description=description, epilog='''
 Upload a file::
 
   $ rucio upload --rse MOCK --scope mock filename.txt

{rucio-37.5.0 → rucio-37.6.0}/bin/rucio-abacus-rse

@@ -27,7 +27,14 @@ def get_parser():
     """
     Returns the argparse parser.
     """
-    parser = argparse.ArgumentParser(description="The Abacus-RSE daemon is responsible for updating RSE usages. It checks if there are new entries in the UpdatedRSECounter table and updates the RSE counter in the RSECounter table by adding or substrating the amount of files and the size.", epilog='''
+    description = (
+        "The Abacus-RSE daemon is responsible for updating RSE usages. "
+        "It checks if there are new entries in the UpdatedRSECounter table "
+        "and updates the RSE counter in the RSECounter table "
+        "by adding or subtracting the amount of files and the size."
+    )
+
+    parser = argparse.ArgumentParser(description=description, epilog='''
 Upload a file to your RSE::
 
   $ rucio upload --rse MOCK --scope mock filename.txt

{rucio-37.5.0 → rucio-37.6.0}/bin/rucio-auditor

@@ -145,7 +145,7 @@ def main(args):
             for each in tmp_list:
                 queue.put(each)
 
-    except:
+    except Exception:
         logging.error('Main process failed: %s', sys.exc_info()[0])
 
     terminate.set()

{rucio-37.5.0 → rucio-37.6.0}/bin/rucio-conveyor-throttler

@@ -27,7 +27,13 @@ def get_parser():
     """
     Returns the argparse parser.
     """
-    parser = argparse.ArgumentParser(description="The Conveyor-Throttler daemon is responsible for managing the internal queue of transfer requests. Depending on transfer limits of current and waiting transfers, it decides whether a transfer should be put in the queue or not.", epilog='''
+    description = (
+        "The Conveyor-Throttler daemon is responsible for managing the internal queue of transfer requests. "
+        "Depending on transfer limits of current and waiting transfers, "
+        "it decides whether a transfer should be put in the queue or not."
+    )
+
+    parser = argparse.ArgumentParser(description=description, epilog='''
 In this example, the transfer limit will be one transfer which means that there should be only one active transfer at the time.
 There will be two waiting transfer requests and no current active transfer.
 After running the daemon, there will be one transfer in the queue which can then be started.

{rucio-37.5.0 → rucio-37.6.0}/bin/rucio-follower

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 """
-Follower is a daemon to aggregate all the events affecting the dids
+Follower is a daemon to aggregate all the events affecting the DIDs
 """
 
 import argparse

{rucio-37.5.0 → rucio-37.6.0}/bin/rucio-judge-cleaner

@@ -27,7 +27,15 @@ def get_parser():
     """
     Returns the argparse parser.
     """
-    parser = argparse.ArgumentParser(description="The Judge-Cleaner daemon is responsible for cleaning expired replication rules. It deletes rules by checking if the 'expired_at' date property is older than the current timestamp. If the rule is expired, it will first remove one lock for the replica and parent datasets if the DID belongs to any. Then it will set a tombstone to the replica to mark it as deletable if there are no rules protecting the replica. After these steps, the rule gets deleted.", epilog='''
+    description = (
+        "The Judge-Cleaner daemon is responsible for cleaning expired replication rules. "
+        "It deletes rules by checking if the 'expired_at' date property is older than the current timestamp. "
+        "If the rule is expired, it will first remove one lock for the replica and parent datasets if the DID belongs to any. "
+        "Then it will set a tombstone to the replica to mark it as deletable if there are no rules protecting the replica. "
+        "After these steps, the rule gets deleted."
+    )
+
+    parser = argparse.ArgumentParser(description=description, epilog='''
 Upload a file to your RSE::
 
   $ rucio upload --rse MOCK --scope mock --name file filename.txt

{rucio-37.5.0 → rucio-37.6.0}/bin/rucio-necromancer

@@ -27,7 +27,13 @@ def get_parser():
     """
     Returns the argparse parser.
     """
-    parser = argparse.ArgumentParser(description="The Necromancer daemon is responsible for managing bad replicas. If a replica that got declared bad has other replicas, it will try to recover it by requesting a new transfer. If there are no replicas anymore, then the file gets marked as lost.", epilog='''
+    description = (
+        "The Necromancer daemon is responsible for managing bad replicas. "
+        "If a replica that got declared bad has other replicas, it will try to recover it by requesting a new transfer. "
+        "If there are no replicas anymore, then the file gets marked as lost."
+    )
+
+    parser = argparse.ArgumentParser(description=description, epilog='''
 Lost replica:
 In this example the file gets uploaded and will only have this replica as there are no replication rules. If it gets declared bad, there will be no replica to recover from.
 Therefore the replica gets marked as lost.

{rucio-37.5.0 → rucio-37.6.0}/bin/rucio-replica-recoverer

@@ -227,14 +227,29 @@ Note that attempting the use the ``--vos`` argument when in single-VO mode will
   $ rucio-replica-recoverer --run-once --vos abc xyz
   2020-07-28 15:21:33,349 5488    WARNING Ignoring argument vos, this is only applicable in a multi-VO setup.
 ''', formatter_class=argparse.RawDescriptionHelpFormatter)  # NOQA: E501
-    parser.add_argument("--nattempts", action="store", default=5, type=int, help='Minimum count of suspicious file replica appearance in bad_replicas table. Default value is 5.')
-    parser.add_argument("--younger-than", action="store", default=5, type=int, help='Consider all file replicas logged in bad_replicas table since specified number of younger-than days. Default value is 5.')
-    parser.add_argument('--vos', nargs='+', type=str, help='Optional list of VOs to consider. Only used in multi-VO mode.')
-    parser.add_argument("--run-once", action="store_true", default=False, help='One iteration only.')
-    parser.add_argument("--limit-suspicious-files-on-rse", action="store", default=5, type=int, help='Maximum number of suspicious replicas on an RSE before that RSE is considered problematic and the suspicious replicas on that RSE are declared "TEMPORARY_UNAVAILABLE". Default value is 5.')
-    parser.add_argument('--json-file-name', action="store", default="/opt/rucio/etc/suspicious_replica_recoverer.json", type=str, help='Name of the json file that that contains the policies which will be used by the suspicious replica recoverer.')
-    parser.add_argument('--sleep-time', action="store", default=3600, type=int, help='Concurrency control: Thread sleep time after each chunk of work.')
-    parser.add_argument('--active-mode', action="store_true", default=False, help='If NOT specified, the daemon will run without taking any actions on any files. In either case, the log file will be produced normally.')
+    parser.add_argument("--nattempts",
+                        action="store", default=5, type=int,
+                        help='Minimum count of suspicious file replica appearance in bad_replicas table. Default value is 5.')
+    parser.add_argument("--younger-than",
+                        action="store", default=5, type=int,
+                        help='Consider all file replicas logged in bad_replicas table since specified number of younger-than days. Default value is 5.')
+    parser.add_argument('--vos', nargs='+', type=str,
+                        help='Optional list of VOs to consider. Only used in multi-VO mode.')
+    parser.add_argument("--run-once",
+                        action="store_true", default=False,
+                        help='One iteration only.')
+    parser.add_argument("--limit-suspicious-files-on-rse",
+                        action="store", default=5, type=int,
+                        help='Maximum number of suspicious replicas on an RSE before that RSE is considered problematic and the suspicious replicas on that RSE are declared "TEMPORARY_UNAVAILABLE". Default value is 5.')
+    parser.add_argument('--json-file-name',
+                        action="store", default="/opt/rucio/etc/suspicious_replica_recoverer.json", type=str,
+                        help='Name of the json file that that contains the policies which will be used by the suspicious replica recoverer.')
+    parser.add_argument('--sleep-time',
+                        action="store", default=3600, type=int,
+                        help='Concurrency control: Thread sleep time after each chunk of work.')
+    parser.add_argument('--active-mode',
+                        action="store_true", default=False,
+                        help='If NOT specified, the daemon will run without taking any actions on any files. In either case, the log file will be produced normally.')
     return parser
 
 
@@ -243,6 +258,13 @@ if __name__ == "__main__":
     PARSER = get_parser()
     ARGS = PARSER.parse_args()
     try:
-        run(once=ARGS.run_once, younger_than=ARGS.younger_than, nattempts=ARGS.nattempts, vos=ARGS.vos, limit_suspicious_files_on_rse=ARGS.limit_suspicious_files_on_rse, json_file_name=ARGS.json_file_name, sleep_time=ARGS.sleep_time, active_mode=ARGS.active_mode)
+        run(once=ARGS.run_once,
+            younger_than=ARGS.younger_than,
+            nattempts=ARGS.nattempts,
+            vos=ARGS.vos,
+            limit_suspicious_files_on_rse=ARGS.limit_suspicious_files_on_rse,
+            json_file_name=ARGS.json_file_name,
+            sleep_time=ARGS.sleep_time,
+            active_mode=ARGS.active_mode)
     except KeyboardInterrupt:
         stop()

{rucio-37.5.0 → rucio-37.6.0}/bin/rucio-undertaker

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 """
-Undertaker is a daemon to manage expired did.
+Undertaker is a daemon to manage expired DID.
 """
 
 import argparse
@@ -27,7 +27,13 @@ def get_parser():
     """
     Returns the argparse parser.
     """
-    parser = argparse.ArgumentParser(description="The Undertaker daemon is responsible for managing expired DIDs. It deletes DIDs, but not replicas by checking if there are DIDs where the 'expired_at' date property is older than the current timestamp.", epilog='''
+    description = (
+        "The Undertaker daemon is responsible for managing expired DIDs. "
+        "It deletes DIDs, but not replicas by checking if there are DIDs where the "
+        "'expired_at' date property is older than the current timestamp."
+    )
+
+    parser = argparse.ArgumentParser(description=description, epilog='''
 Create a DID that is already expired by setting its lifetime to -1::
 
   $ python

{rucio-37.5.0 → rucio-37.6.0}/lib/rucio/cli/bin_legacy/rucio.py

@@ -1266,7 +1266,7 @@ def add_rule(args, client, logger, console, spinner):
     """
     %(prog)s add-rule <did> <copies> <rse-expression> [options]
 
-    Add a rule to a did.
+    Add a rule to a DID.
     """
 
     dids = []

{rucio-37.5.0 → rucio-37.6.0}/lib/rucio/cli/bin_legacy/rucio_admin.py

@@ -752,7 +752,7 @@ def add_scope(args, client, logger, console, spinner):
 
     """
     client.add_scope(account=args.account, scope=args.scope)
-    print('Added new scope to account: %s-%s' % (args.scope, args.account))
+    print(f'Added new scope to {args.account}: {args.scope}')
     return SUCCESS
 
 

{rucio-37.5.0 → rucio-37.6.0}/lib/rucio/cli/did.py

@@ -130,7 +130,7 @@ def content_history(ctx, dids):
 @click.argument("dids", nargs=-1)
 @click.pass_context
 def content_add_(ctx, to_did, from_file, dids):
-    """Attach a list [dids] of Data IDentifiers (file or collection-type) to an other Data IDentifier (collection-type)"""
+    """Attach a list [dids] of data identifiers (file or collection-type) to another data identifier (collection-type)"""
     args = Arguments({"no_pager": ctx.obj.no_pager, "dids": dids, "todid": to_did, "fromfile": from_file})
     attach(args, ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)
 
@@ -140,7 +140,7 @@ def content_add_(ctx, to_did, from_file, dids):
 @click.argument("dids", nargs=-1)
 @click.pass_context
 def content_remove(ctx, dids, from_did):
-    """Detach [dids], a list of DIDs (file or collection-type) from an other Data Identifier (collection type)"""
+    """Detach [dids], a list of DIDs (file or collection-type) from another Data Identifier (collection type)"""
     args = Arguments({"no_pager": ctx.obj.no_pager, "dids": dids, "fromdid": from_did})
     detach(args, ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)
 

{rucio-37.5.0 → rucio-37.6.0}/lib/rucio/cli/rse.py

@@ -55,11 +55,10 @@ def list_(ctx, rses, csv):
 
 @rse.command("show")
 @click.argument("rse-name")
-@click.option("--csv", is_flag=True, default=False, help="Output list of RSE property key and values as a csv")
 @click.pass_context
-def show(ctx, rse_name, csv):
+def show(ctx, rse_name):
     """Usage, protocols, settings, and attributes for a given RSE"""
-    info_rse(Arguments({"no_pager": ctx.obj.no_pager, "rse": rse_name, "csv": csv}), ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)
+    info_rse(Arguments({"no_pager": ctx.obj.no_pager, "rse": rse_name}), ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)
 
 
 @rse.command("add")

{rucio-37.5.0 → rucio-37.6.0}/lib/rucio/cli/subscription.py

@@ -68,6 +68,6 @@ def add_(ctx, subscription_name, did_filter, rule, comment, lifetime, account, p
 @click.pass_context
 def touch(ctx, dids):
     """Reevaluate list of DIDs against all active subscriptions"""
-    # TODO make reeval accept dids as a list
+    # TODO make reeval accept DIDs as a list
     dids = ",".join(dids)
     reevaluate_did_for_subscription(Arguments({"no_pager": ctx.obj.no_pager, "dids": dids}), ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)

{rucio-37.5.0 → rucio-37.6.0}/lib/rucio/client/baseclient.py

@@ -967,7 +967,11 @@ class BaseClient:
         if not os.path.isdir(self.token_path):
             try:
                 self.logger.debug('rucio token folder \'%s\' not found. Create it.' % self.token_path)
-                makedirs(self.token_path, 0o700)
+                try:
+                    makedirs(self.token_path, 0o700)
+                except FileExistsError:
+                    msg = f'Token directory already exists at {self.token_path} - skipping'
+                    self.logger.debug(msg)
             except Exception:
                 raise
 

{rucio-37.5.0 → rucio-37.6.0}/lib/rucio/client/didclient.py

@@ -55,7 +55,7 @@ class DIDClient(BaseClient):
                 like <key>.<operation>, e.g. key1 >= value1 is equivalent to {'key1.gte': value}, where <operation> belongs to one
                 of the set {'lte', 'gte', 'gt', 'lt', 'ne' or ''}. Equivalence doesn't require an operator.
             did_type :
-                The type of the did: 'all'(container, dataset or file)|'collection'(dataset or container)|'dataset'|'container'|'file'
+                The type of the DID: 'all'(container, dataset or file)|'collection'(dataset or container)|'dataset'|'container'|'file'
             long :
                 Long format option to display more information for each DID.
             recursive :
@@ -325,14 +325,14 @@ class DIDClient(BaseClient):
             ignore_duplicate: bool = False
     ) -> bool:
         """
-        Add dids to dids.
+        Add DIDs to DIDs.
 
         Parameters
         ----------
         attachments :
             The attachments.
-            An attachment contains: "scope", "name", "dids".
-            dids is: [{'scope': scope, 'name': name}, ...]
+            An attachment contains: "scope", "name", "DIDs".
+            DIDs is: [{'scope': scope, 'name': name}, ...]
         ignore_duplicate :
             If True, ignore duplicate entries.
         """
@@ -358,8 +358,8 @@ class DIDClient(BaseClient):
         ----------
         attachments :
             The attachments.
-            An attachment contains: "scope", "name", "dids".
-            dids is: [{'scope': scope, 'name': name}, ...]
+            An attachment contains: "scope", "name", "DIDs".
+            DIDs is: [{'scope': scope, 'name': name}, ...]
         ignore_duplicate :
             If True, ignore duplicate entries.
         """
@@ -377,8 +377,8 @@ class DIDClient(BaseClient):
         ----------
         attachments :
             The attachments.
-            An attachment contains: "scope", "name", "dids".
-            dids is: [{'scope': scope, 'name': name}, ...]
+            An attachment contains: "scope", "name", "DIDs".
+            DIDs is: [{'scope': scope, 'name': name}, ...]
         """
         return self.attach_dids_to_dids(attachments=attachments)
 
@@ -393,8 +393,8 @@ class DIDClient(BaseClient):
         ----------
         attachments :
             The attachments.
-            An attachment contains: "scope", "name", "dids".
-            dids is: [{'scope': scope, 'name': name}, ...]
+            An attachment contains: "scope", "name", "DIDs".
+            DIDs is: [{'scope': scope, 'name': name}, ...]
         """
         return self.attach_dids_to_dids(attachments=attachments)
 
@@ -661,7 +661,7 @@ class DIDClient(BaseClient):
         Parameters
         ----------
         dids :
-            A list of dids.
+            A list of DIDs.
         inherit :
             A boolean. If set to true, the metadata of the parent are concatenated.
         plugin :
@@ -752,7 +752,7 @@ class DIDClient(BaseClient):
         Parameters
         ----------
         dids :
-            A list of dids including metadata, i.e.
+            A list of DIDs including metadata, i.e.
             [{'scope': scope1, 'name': name1, 'meta': {key1: value1, key2: value2}}, ...].
         recursive :
             Option to propagate the metadata update to content.
@@ -902,7 +902,7 @@ class DIDClient(BaseClient):
         Returns
         -------
 
-            A did
+            A DID
         """
 
         path = '/'.join([self.DIDS_BASEURL, guid, 'guid'])
@@ -954,7 +954,7 @@ class DIDClient(BaseClient):
             name: str
     ) -> "Iterator[dict[str, Any]]":
         """
-        List parent dataset/containers of a did.
+        List parent dataset/containers of a DID.
 
         Parameters
         ----------
@@ -1016,12 +1016,12 @@ class DIDClient(BaseClient):
 
     def resurrect(self, dids: "Sequence[Mapping[str, Any]]") -> bool:
         """
-        Resurrect a list of dids.
+        Resurrect a list of DIDs.
 
         Parameters
         ----------
         dids :
-            A list of dids [{'scope': scope, 'name': name}, ...]
+            A list of DIDs [{'scope': scope, 'name': name}, ...]
         """
         path = '/'.join([self.DIDS_BASEURL, 'resurrect'])
         url = build_url(choice(self.list_hosts), path=path)

{rucio-37.5.0 → rucio-37.6.0}/lib/rucio/client/downloadclient.py

@@ -285,7 +285,7 @@ class DownloadClient:
         -------
 
             A list of dictionaries with an entry for each file, containing the input options,
-            the did, and the clientState. clientState can be one of the following:
+            the DID, and the clientState. clientState can be one of the following:
             ALREADY_DONE, DONE, FILE_NOT_FOUND, FAIL_VALIDATE, FAILED
 
         Raises
@@ -422,7 +422,7 @@ class DownloadClient:
         -------
 
             A list of dictionaries with an entry for each file, containing the input options,
-            the did, and the clientState.
+            the DID, and the clientState.
 
         Raises
         ------
@@ -499,7 +499,7 @@ class DownloadClient:
         -------
 
             A list of dictionaries with an entry for each file, containing the input options,
-            the did, and the clientState.
+            the DID, and the clientState.
 
         Raises
         ------
@@ -1021,7 +1021,7 @@ class DownloadClient:
         -------
 
             A list of dictionaries with an entry for each file, containing the input options,
-            the did, and the clientState.
+            the DID, and the clientState.
 
 
         Raises
@@ -1173,7 +1173,7 @@ class DownloadClient:
         -------
 
             A list of dictionaries with an entry for each file, containing the input options,
-            the did, and the clientState.
+            the DID, and the clientState.
         """
         trace_custom_fields = trace_custom_fields or {}
         logger = self.logger
@@ -1322,7 +1322,7 @@ class DownloadClient:
 
     def _resolve_one_item_dids(self, item: dict[str, Any]) -> "Iterator[dict[str, Any]]":
         """
-        Resolve scopes or wildcard DIDs to lists of full did names:
+        Resolve scopes or wildcard DIDs to lists of full DID names:
 
         Parameters
         ----------
@@ -1456,10 +1456,10 @@ class DownloadClient:
             if not found_compatible_group:
                 item_groups.append([item])
 
-        # List replicas for dids
+        # List replicas for DIDs
         merged_items_with_sources = []
         for item_group in item_groups:
-            # Take configuration from the first item in the group; but dids from all items
+            # Take configuration from the first item in the group; but DIDs from all items
             item = item_group[0]
             input_dids = {DID(did): did
                           for item in item_group
@@ -1512,15 +1512,15 @@ class DownloadClient:
             logger(logging.DEBUG, 'num resolved files: %s' % len(file_items))
 
             if not nrandom or nrandom != len(file_items):
-                # If list_replicas didn't resolve any file DIDs for any input did, we pass through the input DID.
+                # If list_replicas didn't resolve any file DIDs for any input DID, we pass through the input DID.
                 # This is done to keep compatibility with later code which generates "FILE_NOT_FOUND" traces
                 # and output items.
                 # In the special case of nrandom, when serverside filtering is applied, it's "normal" for some input
-                # dids to be ignored as long as we got exactly nrandom file_items from the server.
+                # DIDs to be ignored as long as we got exactly nrandom file_items from the server.
                 for input_did in input_dids:
                     if not any([input_did == f['did'] or str(input_did) in f['parent_dids'] for f in file_items]):
                         logger(logging.ERROR, 'DID does not exist: %s' % input_did)
-                        # TODO: store did directly as DIDType object
+                        # TODO: store DID directly as DIDType object
                         file_items.append({'did': str(input_did), 'adler32': None, 'md5': None, 'sources': [], 'parent_dids': set(), 'impl': impl or None})
 
             # filtering out tape sources
@@ -1534,7 +1534,7 @@ class DownloadClient:
                         logger(logging.WARNING, 'The requested DID {} only has replicas on tape. Direct download from tape is prohibited. '
                                                 'Please request a transfer to a non-tape endpoint.'.format(file_item['did']))
 
-            # Match the file did back to the dids which were provided to list_replicas.
+            # Match the file DID back to the DIDs which were provided to list_replicas.
             # Later, this will allow to match the file back to input_items via did_to_input_items
             for file_item in file_items:
                 file_did = DID(file_item['did'])
@@ -1628,7 +1628,7 @@ class DownloadClient:
 
         all_dest_file_paths = set()
 
-        # get replicas for every file of the given dids
+        # get replicas for every file of the given DIDs
         for file_item in file_items:
             file_did = DID(file_item['did'])
             input_items = list(itertools.chain.from_iterable(did_to_input_items.get(did, []) for did in file_item['input_dids']))
@@ -1676,7 +1676,7 @@ class DownloadClient:
             file_item['dest_file_paths'] = list(dest_file_paths)
             file_item['temp_file_path'] = '%s.part' % file_item['dest_file_paths'][0]
 
-            # the file did str is not an unique key for this dict because multiple calls of list_replicas
+            # the file DID str is not a unique key for this dict because multiple calls of list_replicas
             # could result in the same DID multiple times. So we're using the id of the dictionary objects
             fiid = id(file_item)
             fiid_to_file_item[fiid] = file_item

{rucio-37.5.0 → rucio-37.6.0}/lib/rucio/client/lockclient.py

@@ -41,9 +41,9 @@ class LockClient(BaseClient):
         Parameters
         ----------
         scope :
-            The scope of the did of the locks to list.
+            The scope of the DID of the locks to list.
         name :
-            The name of the did of the locks to list.
+            The name of the DID of the locks to list.
 
         """
 
@@ -80,7 +80,7 @@ class LockClient(BaseClient):
             list of dictionaries with lock info
         """
 
-        # convert did list to list of dictionaries
+        # convert DID list to list of dictionaries
         if not all(did.get("type", "dataset") in ("dataset", "container") for did in dids):
             raise ValueError("DID type can be either 'container' or 'dataset'")
 

{rucio-37.5.0 → rucio-37.6.0}/lib/rucio/client/replicaclient.py

@@ -416,7 +416,7 @@ class ReplicaClient(BaseClient):
 
     def list_dataset_replicas(self, scope, name, deep=False):
         """
-        List dataset replicas for a did (scope:name).
+        List dataset replicas for a DID (scope:name).
 
         Parameters
         ----------
@@ -446,7 +446,7 @@ class ReplicaClient(BaseClient):
 
     def list_dataset_replicas_bulk(self, dids):
         """
-        List dataset replicas for a did (scope:name).
+        List dataset replicas for a DID (scope:name).
 
         Parameters
         ----------

{rucio-37.5.0 → rucio-37.6.0}/lib/rucio/client/touchclient.py

@@ -49,7 +49,7 @@ class TouchClient(BaseClient):
         Raises
         ------
         DataIdentifierNotFound
-            If given dids does not exist.
+            If given DIDs does not exist.
         RSENotFound
             If rse is not None and given rse does not exist.
         UnsupportedDIDType