rucio 37.5.0__py3-none-any.whl → 37.6.0__py3-none-any.whl

rucio/core/did_meta_plugins/postgres_meta.py

@@ -199,7 +199,7 @@ class ExternalPostgresJSONDidMeta(DidMetaPlugin):
         :param scope: The scope name
         :param name: The data identifier name
         :param session: The database session in use
-        :returns: the metadata for the did
+        :returns: the metadata for the DID
         """
         statement = sql.SQL("SELECT data from {} WHERE scope = {} AND name = {}").format(
             sql.Identifier(self.table),
@@ -221,8 +221,8 @@ class ExternalPostgresJSONDidMeta(DidMetaPlugin):
         """
         Set single metadata key.
 
-        :param scope: the scope of did
-        :param name: the name of the did
+        :param scope: the scope of DID
+        :param name: the name of the DID
         :param key: the key to be added
         :param value: the value of the key to be added
         :param recursive: recurse into DIDs (not supported)
@@ -234,8 +234,8 @@ class ExternalPostgresJSONDidMeta(DidMetaPlugin):
         """
         Bulk set metadata keys.
 
-        :param scope: the scope of did
-        :param name: the name of the did
+        :param scope: the scope of DID
+        :param name: the name of the DID
         :param metadata: dictionary of metadata keypairs to be added
         :param recursive: recurse into DIDs (not supported)
         :param session: The database session in use
@@ -262,8 +262,8 @@ class ExternalPostgresJSONDidMeta(DidMetaPlugin):
         """
         Delete a key from metadata.
 
-        :param scope: the scope of did
-        :param name: the name of the did
+        :param scope: the scope of DID
+        :param name: the name of the DID
         :param key: the key to be deleted
         :param session: the database session in use
         """

rucio/core/dirac.py

@@ -46,7 +46,7 @@ def _exists(
     session: "Session"
 ) -> tuple[bool, Optional[DIDType]]:
     """
-    Check if the did exists
+    Check if the DID exists
 
     :scope: The scope
     :name: The name

rucio/core/lifetime_exception.py

@@ -85,7 +85,7 @@ def add_exception(
     """
     Add exceptions to Lifetime Model.
 
-    :param dids:        The list of dids
+    :param dids:        The list of DIDs
     :param account:     The account of the requester.
     :param pattern:     The account.
     :param comments:    The comments associated to the exception.
@@ -160,7 +160,7 @@ def __add_exception(
     """
     Add exceptions to Lifetime Model.
 
-    :param dids:                   The list of dids
+    :param dids:                   The list of DIDs
     :param account:                The account of the requester.
     :param pattern:                The pattern of the exception (not used).
     :param comments:               The comments associated to the exception.

rucio/core/lock.py

@@ -81,7 +81,7 @@ def get_dataset_locks_bulk(dids: "Iterable[dict[str, Any]]", *, session: "Sessio
     Get the dataset locks of a list of datasets or containers, recursively
 
     :param dids:           List of dictionaries {"scope":scope(type:InternalScope), "name":name,
-                           "type":did type(DIDType.DATASET or DIDType.CONTAINER)}, "type" is optional
+                           "type":DID type(DIDType.DATASET or DIDType.CONTAINER)}, "type" is optional
     :param session:        The db session to use.
     :return:               Generator of lock_info dicts, may contain duplicates
     """
@@ -156,8 +156,8 @@ def get_replica_locks(scope: InternalScope, name: str, nowait: bool = False, res
     """
     Get the active replica locks for a file
 
-    :param scope:          Scope of the did.
-    :param name:           Name of the did.
+    :param scope:          Scope of the DID.
+    :param name:           Name of the DID.
     :param nowait:         Nowait parameter for the FOR UPDATE statement.
     :param restrict_rses:  Possible RSE_ids to filter on.
     :param session:        The db session.
@@ -334,8 +334,8 @@ def successful_transfer(scope: InternalScope, name: str, rse_id: str, nowait: bo
     """
     Update the state of all replica locks because of an successful transfer
 
-    :param scope:    Scope of the did
-    :param name:     Name of the did
+    :param scope:    Scope of the DID
+    :param name:     Name of the DID
     :param rse_id:   RSE id
     :param nowait:   Nowait parameter for the for_update queries.
     :param session:  DB Session.
@@ -426,8 +426,8 @@ def failed_transfer(scope: InternalScope, name: str, rse_id: str, error_message:
     Update the state of all replica locks because of a failed transfer.
     If a transfer is permanently broken for a rule, the broken_rule_id should be filled which puts this rule into the SUSPENDED state.
 
-    :param scope:           Scope of the did.
-    :param name:            Name of the did.
+    :param scope:           Scope of the DID.
+    :param name:            Name of the DID.
     :param rse_id:          RSE id.
     :param error_message:   The error why this transfer failed.
     :param broken_rule_id:  Id of the rule which will be suspended.

rucio/core/meta_conventions.py

@@ -180,10 +180,10 @@ def list_values(key: str, *, session: "Session") -> list[str]:
 @read_session
 def validate_meta(meta: dict, did_type: DIDType, *, session: "Session") -> None:
     """
-    Validates metadata for a did.
+    Validates metadata for a DID.
 
     :param meta: the dictionary of metadata.
-    :param meta: the type of the did, e.g, DATASET, CONTAINER, FILE.
+    :param meta: the type of the DID, e.g, DATASET, CONTAINER, FILE.
     :param session: The database session in use.
 
     :raises InvalidObject:

rucio/core/monitor.py

@@ -444,5 +444,5 @@ class MetricManager:
         for server in self.push_gateways:
             try:
                 push_to_gateway(server.strip(), job=job, registry=self.registry, grouping_key=grouping_key)
-            except:
+            except Exception:
                 continue

rucio/core/naming_convention.py

@@ -69,7 +69,7 @@ def add_naming_convention(
         new_convention.save(session=session)
     except IntegrityError:
         raise Duplicate('Naming convention already exists!')
-    except:
+    except Exception:
         raise RucioException(str(format_exc()))
 
 

rucio/core/nongrid_trace.py

@@ -59,7 +59,7 @@ ROTATING_LOGGER.addHandler(ROTATING_HANDLER)
 BROKERS_ALIAS, BROKERS_RESOLVED = [], []
 try:
     BROKERS_ALIAS = config_get_list('nongrid-trace', 'brokers')
-except:
+except Exception:
     raise Exception('Could not load brokers from configuration')
 
 PORT = config_get_int('nongrid-trace', 'port')
@@ -74,7 +74,7 @@ for broker in BROKERS_ALIAS:
     try:
         addrinfos = socket.getaddrinfo(broker, 0, socket.AF_INET, 0, socket.IPPROTO_TCP)
         BROKERS_RESOLVED = [ai[4][0] for ai in addrinfos]
-    except:
+    except Exception:
         pass
 
 CONNS = []

rucio/core/oidc.py

@@ -173,7 +173,7 @@ def __get_rucio_oidc_clients(keytimeout: int = 43200) -> tuple[dict, dict]:
     try:
         with open(IDPSECRETS) as client_secret_file:
             client_secrets = json.load(client_secret_file)
-    except:
+    except Exception:
         return (clients, admin_clients)
     for iss in client_secrets:
         try:
@@ -1426,7 +1426,7 @@ def validate_jwt(json_web_token: str, *, session: "Session") -> dict[str, Any]:
             try:
                 token_dict['audience'] = inspect_claims['aud']
                 token_dict['authz_scope'] = inspect_claims['scope']
-            except:
+            except Exception:
                 pass
         METRICS.counter(name='JSONWebToken.valid').inc()
         # if token is valid and coming from known issuer --> check aud and scope and save it if unknown

rucio/core/permission/__init__.py

@@ -20,7 +20,7 @@ from typing import TYPE_CHECKING, Any
 
 import rucio.core.permission.generic
 from rucio.common import config, exception
-from rucio.common.plugins import check_policy_package_version
+from rucio.common.plugins import check_policy_module_version
 from rucio.common.policy import get_policy
 
 if TYPE_CHECKING:
@@ -54,9 +54,10 @@ if not multivo:
                 policy = environ['RUCIO_POLICY_PACKAGE']
             else:
                 policy = config.config_get('policy', 'package', check_config_table=False)
-            check_policy_package_version(policy)
+            package_module = importlib.import_module(policy)
+            check_policy_module_version(package_module)
             policy = policy + ".permission"
-        except (NoOptionError, NoSectionError):
+        except (NoOptionError, NoSectionError, ModuleNotFoundError):
             # fall back to old system for now
             policy = 'rucio.core.permission.' + fallback_policy.lower()
     else:
@@ -91,9 +92,10 @@ def load_permission_for_vo(vo: str) -> None:
                 policy = environ[env_name]
             else:
                 policy = config.config_get('policy', 'package-' + vo)
-            check_policy_package_version(policy)
+            package_module = importlib.import_module(policy)
+            check_policy_module_version(package_module)
             policy = policy + ".permission"
-        except (NoOptionError, NoSectionError):
+        except (NoOptionError, NoSectionError, ModuleNotFoundError):
             # fall back to old system for now
             try:
                 policy = config.config_get('policy', 'permission')

rucio/core/permission/generic.py

@@ -1086,7 +1086,7 @@ def perm_add_bad_pfns(issuer: "InternalAccount", kwargs: dict[str, Any], *, sess
 
 def perm_remove_did_from_followed(issuer: "InternalAccount", kwargs: dict[str, Any], *, session: "Optional[Session]" = None) -> bool:
     """
-    Checks if an account can remove did from followed table.
+    Checks if an account can remove DID from followed table.
 
     :param issuer: Account identifier which issues the command.
     :param kwargs: List of arguments for the action.
@@ -1101,7 +1101,7 @@ def perm_remove_did_from_followed(issuer: "InternalAccount", kwargs: dict[str, A
 
 def perm_remove_dids_from_followed(issuer: "InternalAccount", kwargs: dict[str, Any], *, session: "Optional[Session]" = None) -> bool:
     """
-    Checks if an account can bulk remove dids from followed table.
+    Checks if an account can bulk remove DIDs from followed table.
 
     :param issuer: Account identifier which issues the command.
     :param kwargs: List of arguments for the action.

rucio/core/permission/generic_multi_vo.py

@@ -1055,7 +1055,7 @@ def perm_add_bad_pfns(issuer, kwargs, *, session: "Optional[Session]" = None):
 
 def perm_remove_did_from_followed(issuer, kwargs, *, session: "Optional[Session]" = None):
     """
-    Checks if an account can remove did from followed table.
+    Checks if an account can remove DID from followed table.
 
     :param issuer: Account identifier which issues the command.
     :param kwargs: List of arguments for the action.
@@ -1070,7 +1070,7 @@ def perm_remove_did_from_followed(issuer, kwargs, *, session: "Optional[Session]
 
 def perm_remove_dids_from_followed(issuer, kwargs, *, session: "Optional[Session]" = None):
     """
-    Checks if an account can bulk remove dids from followed table.
+    Checks if an account can bulk remove DIDs from followed table.
 
     :param issuer: Account identifier which issues the command.
     :param kwargs: List of arguments for the action.

rucio/core/replica.py

@@ -1298,7 +1298,7 @@ def list_replicas(
             session: "Session"
     ) -> tuple[int, Any]:
         """
-        Find all FILE dids contained in collections from temp_table and return them in a newly
+        Find all FILE DIDs contained in collections from temp_table and return them in a newly
         created temporary table.
         """
         resolved_files_temp_table = temp_table_mngr(session).create_scope_name_table()
@@ -1391,7 +1391,7 @@ def list_replicas(
         Builds a query which list the replicas of FILEs from users input, but ignores
         collections in the same input.
 
-        Note: These FILE dids must be returned to the user even if they don't have replicas,
+        Note: These FILE DIDs must be returned to the user even if they don't have replicas,
         hence the outerjoin against the replicas_subquery.
         """
         return select(
@@ -1426,7 +1426,7 @@ def list_replicas(
             session: "Session"
     ) -> tuple[int, int, int]:
         """
-        Find how many files, collections and constituents are among the dids in the temp_table
+        Find how many files, collections and constituents are among the DIDs in the temp_table
         """
         stmt = select(
             func.sum(
@@ -1493,7 +1493,7 @@ def list_replicas(
             nrandom
             # Only try this optimisation if list_replicas was called on collection(s).
             # I didn't consider handling the case when list_replica is called with a mix of
-            # file/archive/collection dids: database queries in those cases are more complex
+            # file/archive/collection DIDs: database queries in those cases are more complex
             # and people don't usually call list_replicas with nrandom on file/archive_constituents anyway.
             and (num_files_in_collections and not num_constituents and not num_files)
             # The following code introduces overhead if it fails to pick n random replicas.
@@ -1533,7 +1533,7 @@ def list_replicas(
         )
         session.execute(stmt)
 
-        # Fetch all replicas for randomly selected dids and apply filters on python side
+        # Fetch all replicas for randomly selected DIDs and apply filters on python side
         stmt = _list_replicas_for_collection_files_stmt(random_dids_temp_table, replicas_subquery)
         stmt = stmt.order_by('scope', 'name')
         replica_tuples = session.execute(stmt)
@@ -1583,7 +1583,7 @@ def __bulk_add_new_file_dids(
     session: "Session"
 ) -> Literal[True]:
     """
-    Bulk add new dids.
+    Bulk add new DIDs.
 
     :param dids: the list of new files.
     :param account: The account owner.
@@ -1636,7 +1636,7 @@ def __bulk_add_file_dids(
     session: "Session"
 ) -> list[dict[str, Any]]:
     """
-    Bulk add new dids.
+    Bulk add new DIDs.
 
     :param dids: the list of files.
     :param account: The account owner.
@@ -1703,7 +1703,7 @@ def __bulk_add_replicas(
     session: "Session"
 ) -> tuple[int, int]:
     """
-    Bulk add new dids.
+    Bulk add new DIDs.
 
     :param rse_id: the RSE id.
     :param dids: the list of files.
@@ -2016,7 +2016,7 @@ def __cleanup_after_replica_deletion(
     session: "Session"
 ) -> None:
     """
-    Perform update of collections/archive associations/dids after the removal of their replicas
+    Perform update of collections/archive associations/DIDs after the removal of their replicas
     :param rse_id: the rse id
     :param files: list of files whose replica got deleted
     :param session: The database session in use.
@@ -2080,7 +2080,7 @@ def __cleanup_after_replica_deletion(
                                             rse_id=rse_id). \
                 save(session=session, flush=False)
 
-    # Delete did from the content for the last did
+    # Delete DID from the content for the last DID
     while parents_to_analyze:
         did_associations_to_remove = set()
 
@@ -2287,7 +2287,7 @@ def __cleanup_after_replica_deletion(
 
         session.execute(stmt)
 
-    # delete empty dids
+    # delete empty DIDs
     if did_condition:
         for chunk in chunks(did_condition, 10):
             stmt = select(
@@ -2426,7 +2426,7 @@ def __cleanup_after_replica_deletion(
         for chunk in chunks(messages, 100):
             add_messages(chunk, session=session)
 
-        # Delete dids
+        # Delete DIDs
         dids_to_delete_filter = exists(select(1)
                                        .where(and_(models.DataIdentifier.scope == scope_name_temp_table.scope,
                                                    models.DataIdentifier.name == scope_name_temp_table.name)))
@@ -2806,7 +2806,7 @@ def touch_replica(
     session: "Session"
 ) -> bool:
     """
-    Update the accessed_at timestamp of the given file replica/did but don't wait if row is locked.
+    Update the accessed_at timestamp of the given file replica/DID but don't wait if row is locked.
 
     :param replica: a dictionary with the information of the affected replica.
     :param session: The database session in use.
@@ -2921,8 +2921,8 @@ def get_and_lock_file_replicas(
     """
     Get file replicas for a specific scope:name.
 
-    :param scope:          The scope of the did.
-    :param name:           The name of the did.
+    :param scope:          The scope of the DID.
+    :param name:           The name of the DID.
     :param nowait:         Nowait parameter for the FOR UPDATE statement
     :param restrict_rses:  Possible RSE_ids to filter on.
     :param session:        The db session in use.
@@ -2957,8 +2957,8 @@ def get_source_replicas(
     """
     Get source replicas for a specific scope:name.
 
-    :param scope:          The scope of the did.
-    :param name:           The name of the did.
+    :param scope:          The scope of the DID.
+    :param name:           The name of the DID.
     :param soruce_rses:    Possible RSE_ids to filter on.
     :param session:        The db session in use.
     :returns:              List of SQLAlchemy Replica Objects

rucio/core/rule.py

@@ -191,7 +191,7 @@ def add_rule(
     logger: LoggerFunction = logging.log
 ) -> list[str]:
     """
-    Adds a replication rule for every did in dids
+    Adds a replication rule for every DID in DIDs
 
     :param dids:                       List of data identifiers.
     :param account:                    Account issuing the rule.
@@ -277,7 +277,7 @@ def add_rule(
         notify_value = {'Y': RuleNotification.YES, 'C': RuleNotification.CLOSE, 'P': RuleNotification.PROGRESS}.get(notify or '', RuleNotification.NO)
 
         for elem in dids:
-            # 3. Get the did
+            # 3. Get the DID
             with METRICS.timer('add_rule.get_did'):
                 try:
                     stmt = select(
@@ -292,7 +292,7 @@ def add_rule(
                 except TypeError as error:
                     raise InvalidObject(error.args) from error  # https://pylint.readthedocs.io/en/latest/user_guide/messages/warning/raise-missing-from.html
 
-            # 3.1 If the did is a constituent, relay the rule to the archive
+            # 3.1 If the DID is a constituent, relay the rule to the archive
             if did.did_type == DIDType.FILE and did.constituent:
                 # Check if a single replica of this DID exists; Do not put rule on file if there are only replicas on TAPE
                 stmt = select(
@@ -407,7 +407,7 @@ def add_rule(
                 logger(logging.DEBUG, "Forced injection of rule %s", str(new_rule.id))
 
             if asynchronous or delay_injection:
-                # TODO: asynchronous mode only available for closed dids (on the whole tree?)
+                # TODO: asynchronous mode only available for closed DIDs (on the whole tree?)
                 new_rule.state = RuleState.INJECT
                 logger(logging.DEBUG, "Created rule %s for injection", str(new_rule.id))
                 if delay_injection:
@@ -485,7 +485,7 @@ def add_rules(
     logger: LoggerFunction = logging.log
 ) -> dict[tuple[InternalScope, str], list[str]]:
     """
-    Adds a list of replication rules to every did in dids
+    Adds a list of replication rules to every DID in DIDs
 
     :params dids:    List of data identifiers.
     :param rules:    List of dictionaries defining replication rules.
@@ -521,7 +521,7 @@ def add_rules(
             all_source_rses = list(set([rse['id'] for rse in all_source_rses]))
 
         for elem in dids:
-            # 2. Get the did
+            # 2. Get the DID
             with METRICS.timer('add_rules.get_did'):
                 try:
                     stmt = select(
@@ -536,7 +536,7 @@ def add_rules(
                 except TypeError as error:
                     raise InvalidObject(error.args) from error
 
-            # 2.1 If the did is a constituent, relay the rule to the archive
+            # 2.1 If the DID is a constituent, relay the rule to the archive
             if did.did_type == DIDType.FILE and did.constituent:  # Check if a single replica of this DID exists
                 stmt = select(
                     func.count()
@@ -584,7 +584,7 @@ def add_rules(
 
             rule_ids[(elem['scope'], elem['name'])] = []
 
-            # 3. Resolve the did into its contents
+            # 3. Resolve the DID into its contents
             with METRICS.timer('add_rules.resolve_dids_to_locks_replicas'):
                 # Get all Replicas, not only the ones interesting for the rse_expression
                 datasetfiles, locks, replicas, source_replicas = __resolve_did_to_locks_and_replicas(did=did,
@@ -828,7 +828,7 @@ def inject_rule(
         dids = [{'scope': dataset['scope'], 'name': dataset['name']} for dataset in rucio.core.did.list_child_datasets(scope=rule.scope, name=rule.name, session=session)]
         # Remove duplicates from the list of dictionaries
         dids = [dict(t) for t in {tuple(d.items()) for d in dids}]
-        # Remove dids which already have a similar rule
+        # Remove DIDs which already have a similar rule
         stmt = select(
             models.ReplicationRule.id
         ).where(
@@ -881,7 +881,7 @@ def inject_rule(
     with METRICS.timer('inject_rule.create_rse_selector'):
         rseselector = RSESelector(account=rule['account'], rses=rses, weight=rule.weight, copies=rule.copies, ignore_account_limit=rule.ignore_account_limit, session=session)
 
-    # 3. Get the did
+    # 3. Get the DID
     with METRICS.timer('inject_rule.get_did'):
         try:
             stmt = select(
@@ -1104,7 +1104,7 @@ def list_associated_rules_for_file(
     :param session: The database session in use.
     :raises:        RucioException
     """
-    rucio.core.did.get_did(scope=scope, name=name, session=session)  # Check if the did actually exists
+    rucio.core.did.get_did(scope=scope, name=name, session=session)  # Check if the DID actually exists
     stmt = select(
         models.ReplicationRule,
         models.DataIdentifier.bytes
@@ -1364,7 +1364,7 @@ def repair_rule(
                 rule.locks_stuck_cnt = count.state_counter
         logger(logging.DEBUG, "Finished resetting counters for rule %s [%d/%d/%d]", str(rule.id), rule.locks_ok_cnt, rule.locks_replicating_cnt, rule.locks_stuck_cnt)
 
-        # Get the did
+        # Get the DID
         stmt = select(
             models.DataIdentifier
         ).where(
@@ -1387,7 +1387,7 @@ def repair_rule(
             hard_repair = True
             logger(logging.DEBUG, 'Repairing rule %s in HARD mode', str(rule.id))
 
-        # Resolve the did to its contents
+        # Resolve the DID to its contents
         datasetfiles, locks, replicas, source_replicas = __resolve_did_to_locks_and_replicas(did=did,
                                                                                              nowait=True,
                                                                                              restrict_rses=[rse['id'] for rse in rses],
@@ -2060,10 +2060,10 @@ def re_evaluate_did(
     logger: LoggerFunction = logging.log
 ) -> None:
     """
-    Re-Evaluates a did.
+    Re-Evaluates a DID.
 
-    :param scope:                   The scope of the did to be re-evaluated.
-    :param name:                    The name of the did to be re-evaluated.
+    :param scope:                   The scope of the DID to be re-evaluated.
+    :param name:                    The name of the DID to be re-evaluated.
     :param rule_evaluation_action:  The Rule evaluation action.
     :param session:                 The database session in use.
     :param logger:                  Optional decorated logger that can be passed from the calling daemons or servers.
@@ -2086,7 +2086,7 @@ def re_evaluate_did(
     else:
         __evaluate_did_detach(did, session=session, logger=logger)
 
-    # Update size and length of did
+    # Update size and length of DID
     if session.bind.dialect.name == 'oracle':
         stmt = select(
             func.sum(models.DataIdentifierAssociation.bytes),
@@ -2118,12 +2118,12 @@ def get_updated_dids(
     session: "Session"
 ) -> list[tuple[str, InternalScope, str, DIDReEvaluation]]:
     """
-    Get updated dids.
+    Get updated DIDs.
 
     :param total_workers:      Number of total workers.
     :param worker_number:      id of the executing worker.
-    :param limit:              Maximum number of dids to return.
-    :param blocked_dids:       Blocked dids to filter.
+    :param limit:              Maximum number of DIDs to return.
+    :param blocked_dids:       Blocked DIDs to filter.
     :param session:            Database session in use.
     """
     blocked_dids = blocked_dids or []
@@ -2135,7 +2135,7 @@ def get_updated_dids(
     )
     stmt = filter_thread_work(session=session, query=stmt, total_threads=total_workers, thread_id=worker_number, hash_variable='name')
 
-    # Remove blocked dids from query, but only do the first 30 ones, not to overload the query
+    # Remove blocked DIDs from query, but only do the first 30 ones, not to overload the query
     if blocked_dids:
         chunk = list(chunks(blocked_dids, 30))[0]
         stmt = stmt.where(tuple_(models.UpdatedDID.scope, models.UpdatedDID.name).notin_(chunk))
@@ -3403,9 +3403,9 @@ def __evaluate_did_detach(
     logger: LoggerFunction = logging.log
 ) -> None:
     """
-    Evaluate a parent did which has children removed.
+    Evaluate a parent DID which has children removed.
 
-    :param eval_did:  The did object in use.
+    :param eval_did:  The DID object in use.
     :param session:   The database session in use.
     :param logger:    Optional decorated logger that can be passed from the calling daemons or servers.
     """
@@ -3563,9 +3563,9 @@ def __evaluate_did_attach(
     logger: LoggerFunction = logging.log
 ) -> None:
     """
-    Evaluate a parent did which has new children
+    Evaluate a parent DID which has new children
 
-    :param eval_did:  The did object in use.
+    :param eval_did:  The DID object in use.
     :param session:   The database session in use.
     :param logger:    Optional decorated logger that can be passed from the calling daemons or servers.
     :raises:          ReplicationRuleCreationTemporaryFailed
@@ -3793,7 +3793,7 @@ def __evaluate_did_attach(
                         # Insert rule history
                         insert_rule_history(rule=rule, recent=True, longterm=False, session=session)
 
-            # Unflage the dids
+            # Unflag the DIDs
             with METRICS.timer('evaluate_did_attach.update_did'):
                 for did in new_child_dids:
                     did.rule_evaluation = None
@@ -3815,9 +3815,9 @@ def __resolve_did_to_locks_and_replicas(
            dict[tuple[str, str], models.RSEFileAssociation],
            dict[tuple[str, str], str]]:
     """
-    Resolves a did to its constituent children and reads the locks and replicas of all the constituent files.
+    Resolves a DID to its constituent children and reads the locks and replicas of all the constituent files.
 
-    :param did:            The db object of the did the rule is applied on.
+    :param did:            The db object of the DID the rule is applied on.
     :param nowait:         Nowait parameter for the FOR UPDATE statement.
     :param restrict_rses:  Possible rses of the rule, so only these replica/locks should be considered.
     :param source_rses:    Source rses for this rule. These replicas are not row-locked.
@@ -3922,7 +3922,7 @@ def __resolve_dids_to_locks_and_replicas(
            dict[tuple[str, str], models.RSEFileAssociation],
            dict[tuple[str, str], str]]:
     """
-    Resolves a list of dids to its constituent children and reads the locks and replicas of all the constituent files.
+    Resolves a list of DIDs to its constituent children and reads the locks and replicas of all the constituent files.
 
     :param dids:           The list of DataIdentifierAssociation objects.
     :param nowait:         Nowait parameter for the FOR UPDATE statement.
@@ -3940,7 +3940,7 @@ def __resolve_dids_to_locks_and_replicas(
     restrict_rses = restrict_rses or []
 
     if dids[0].child_type == DIDType.FILE:
-        # All the dids will be files!
+        # All the DIDs will be files!
         # Prepare the datasetfiles
         files = []
         for did in dids:

rucio/core/rule_grouping.py

@@ -1317,9 +1317,9 @@ def __set_replica_unavailable(replica, *, session: "Session"):
 @transactional_session
 def apply_rule(did, rule, rses, source_rses, rseselector, *, session: "Session", logger=logging.log):
     """
-    Apply a replication rule to one did.
+    Apply a replication rule to one DID.
 
-    :param did:          the did object
+    :param did:          the DID object
     :param rule:         the rule object
     :param rses:         target rses_ids
     :param source_rses:  source rses_ids
@@ -1616,4 +1616,3 @@ def apply_rule(did, rule, rses, source_rses, rseselector, *, session: "Session",
     for rse_id in account_counters_files:
         account_counter.increase(rse_id=rse_id, account=rule.account, files=account_counters_files[rse_id], bytes_=account_counters_bytes[rse_id], session=session)
     session.flush()
-

rucio/core/scope.py

@@ -65,7 +65,7 @@ def add_scope(scope, account, *, session: "Session"):
             raise Duplicate('Scope \'%s\' already exists!' % scope)
         else:
             raise RucioException(e)
-    except:
+    except Exception:
         raise RucioException(str(format_exc()))
 
 

rucio/core/trace.py

@@ -71,7 +71,7 @@ ROTATING_LOGGER.addHandler(ROTATING_HANDLER)
 BROKERS_ALIAS, BROKERS_RESOLVED = [], []
 try:
     BROKERS_ALIAS = config_get_list('trace', 'brokers')
-except:
+except Exception:
     raise Exception('Could not load brokers from configuration')
 
 PORT = config_get_int('trace', 'port')
@@ -285,7 +285,7 @@ for broker in BROKERS_ALIAS:
     try:
         addrinfos = socket.getaddrinfo(broker, 0, socket.AF_INET, 0, socket.IPPROTO_TCP)
         BROKERS_RESOLVED = [ai[4][0] for ai in addrinfos]
-    except:
+    except Exception:
         pass
 
 CONNS = []