rucio 38.3.0__tar.gz → 38.4.0__tar.gz

{rucio-38.3.0 → rucio-38.4.0}/PKG-INFO

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

{rucio-38.3.0 → rucio-38.4.0}/lib/rucio/cli/did.py

@@ -35,7 +35,7 @@ def did():
     """,
 )  # TODO Shorten this help and make supplying this easier
 @click.option("--short", is_flag=True, default=False, help="Just dump the list of DIDs.")
-@click.argument("did-pattern", nargs=-1)
+@click.argument("did-pattern", nargs=-1, required=True)
 @click.option("--parent", default=False, is_flag=True, help="List the parents of the DID - must use a full DID scope and name")
 @click.pass_context
 def list_(ctx, did_pattern, recursive, filter_, short, parent):

{rucio-38.3.0 → rucio-38.4.0}/lib/rucio/cli/opendata.py

@@ -175,9 +175,26 @@ def update_opendata_did(ctx: "Context", did: str, meta: Optional[str],
     Update an existing Opendata DID in the Opendata catalog.
     """
 
-    client = ctx.obj.client
     if not any([meta, state, doi]):
         raise ValueError("At least one of --meta, --state, or --doi must be provided.")
 
+    client = ctx.obj.client
+    spinner = ctx.obj.spinner
+    console = ctx.obj.console
+
     scope, name = extract_scope(did)
-    client.update_opendata_did(scope=scope, name=name, meta=meta, state=state, doi=doi)
+    info = client.update_opendata_did(scope=scope, name=name, meta=meta, state=state, doi=doi)
+
+    if cli_config == 'rich':
+        spinner.update(status='Fetching Opendata DID stats')
+        spinner.start()
+        keyword_styles = {**CLITheme.BOOLEAN, **CLITheme.OPENDATA_DID_STATE}
+
+        table_data = [(k, Text(str(v), style=keyword_styles.get(str(v), 'default'))) for (k, v) in
+                      sorted(info.items())]
+        table = generate_table(table_data, row_styles=['none'], col_alignments=['left', 'left'])
+        spinner.stop()
+        print_output(table, console=console, no_pager=ctx.obj.no_pager)
+    else:
+        table = [(k + ':', str(v)) for (k, v) in sorted(info.items())]
+        print(tabulate(table, tablefmt='plain', disable_numparse=True))

{rucio-38.3.0 → rucio-38.4.0}/lib/rucio/client/accountclient.py

@@ -19,6 +19,7 @@ from urllib.parse import quote_plus
 from requests.status_codes import codes
 
 from rucio.client.baseclient import BaseClient, choice
+from rucio.common.constants import HTTPMethod
 from rucio.common.utils import build_url
 
 if TYPE_CHECKING:
@@ -59,7 +60,7 @@ class AccountClient(BaseClient):
         path = '/'.join([self.ACCOUNTS_BASEURL, account])
         url = build_url(choice(self.list_hosts), path=path)
 
-        res = self._send_request(url, type_='POST', data=data)
+        res = self._send_request(url, method=HTTPMethod.POST, data=data)
         if res.status_code == codes.created:
             return True
         exc_cls, exc_msg = self._get_exception(headers=res.headers, status_code=res.status_code, data=res.content)
@@ -88,7 +89,7 @@ class AccountClient(BaseClient):
         path = '/'.join([self.ACCOUNTS_BASEURL, account])
         url = build_url(choice(self.list_hosts), path=path)
 
-        res = self._send_request(url, type_='DEL')
+        res = self._send_request(url, method=HTTPMethod.DELETE)
 
         if res.status_code == codes.ok:
             return True
@@ -118,7 +119,7 @@ class AccountClient(BaseClient):
         path = '/'.join([self.ACCOUNTS_BASEURL, account])
         url = build_url(choice(self.list_hosts), path=path)
 
-        res = self._send_request(url)
+        res = self._send_request(url, method=HTTPMethod.GET)
         if res.status_code == codes.ok:
             acc = self._load_json_data(res)
             return next(acc)
@@ -152,7 +153,7 @@ class AccountClient(BaseClient):
         path = '/'.join([self.ACCOUNTS_BASEURL, account])
         url = build_url(choice(self.list_hosts), path=path)
 
-        res = self._send_request(url, type_='PUT', data=data)
+        res = self._send_request(url, method=HTTPMethod.PUT, data=data)
 
         if res.status_code == codes.ok:
             return True
@@ -199,7 +200,7 @@ class AccountClient(BaseClient):
             for key in filters:
                 params[key] = filters[key]
 
-        res = self._send_request(url, params=params)
+        res = self._send_request(url, method=HTTPMethod.GET, params=params)
 
         if res.status_code == codes.ok:
             accounts = self._load_json_data(res)
@@ -263,7 +264,7 @@ class AccountClient(BaseClient):
 
         url = build_url(choice(self.list_hosts), path=path)
 
-        res = self._send_request(url, type_='POST', data=data)
+        res = self._send_request(url, method=HTTPMethod.POST, data=data)
 
         if res.status_code == codes.created:
             return True
@@ -300,7 +301,7 @@ class AccountClient(BaseClient):
 
         url = build_url(choice(self.list_hosts), path=path)
 
-        res = self._send_request(url, type_='DEL', data=data)
+        res = self._send_request(url, method=HTTPMethod.DELETE, data=data)
 
         if res.status_code == codes.ok:
             return True
@@ -319,7 +320,7 @@ class AccountClient(BaseClient):
         """
         path = '/'.join([self.ACCOUNTS_BASEURL, account, 'identities'])
         url = build_url(choice(self.list_hosts), path=path)
-        res = self._send_request(url)
+        res = self._send_request(url, method=HTTPMethod.GET)
         if res.status_code == codes.ok:
             identities = self._load_json_data(res)
             return identities
@@ -340,7 +341,7 @@ class AccountClient(BaseClient):
 
         path = '/'.join([self.ACCOUNTS_BASEURL, account, 'rules'])
         url = build_url(choice(self.list_hosts), path=path)
-        res = self._send_request(url, type_='GET')
+        res = self._send_request(url, method=HTTPMethod.GET)
         if res.status_code == codes.ok:
             return self._load_json_data(res)
         else:
@@ -385,7 +386,7 @@ class AccountClient(BaseClient):
 
         path = '/'.join([self.ACCOUNTS_BASEURL, account, 'limits', 'global', quote_plus(rse_expression)])
         url = build_url(choice(self.list_hosts), path=path)
-        res = self._send_request(url, type_='GET')
+        res = self._send_request(url, method=HTTPMethod.GET)
         if res.status_code == codes.ok:
             return next(self._load_json_data(res))
         exc_cls, exc_msg = self._get_exception(headers=res.headers, status_code=res.status_code, data=res.content)
@@ -403,7 +404,7 @@ class AccountClient(BaseClient):
 
         path = '/'.join([self.ACCOUNTS_BASEURL, account, 'limits', 'global'])
         url = build_url(choice(self.list_hosts), path=path)
-        res = self._send_request(url, type_='GET')
+        res = self._send_request(url, method=HTTPMethod.GET)
         if res.status_code == codes.ok:
             return next(self._load_json_data(res))
         exc_cls, exc_msg = self._get_exception(headers=res.headers, status_code=res.status_code, data=res.content)
@@ -421,7 +422,7 @@ class AccountClient(BaseClient):
 
         path = '/'.join([self.ACCOUNTS_BASEURL, account, 'limits', 'local'])
         url = build_url(choice(self.list_hosts), path=path)
-        res = self._send_request(url, type_='GET')
+        res = self._send_request(url, method=HTTPMethod.GET)
         if res.status_code == codes.ok:
             return next(self._load_json_data(res))
         exc_cls, exc_msg = self._get_exception(headers=res.headers, status_code=res.status_code, data=res.content)
@@ -441,7 +442,7 @@ class AccountClient(BaseClient):
 
         path = '/'.join([self.ACCOUNTS_BASEURL, account, 'limits', 'local', rse])
         url = build_url(choice(self.list_hosts), path=path)
-        res = self._send_request(url, type_='GET')
+        res = self._send_request(url, method=HTTPMethod.GET)
         if res.status_code == codes.ok:
             return next(self._load_json_data(res))
         exc_cls, exc_msg = self._get_exception(headers=res.headers, status_code=res.status_code, data=res.content)
@@ -463,7 +464,7 @@ class AccountClient(BaseClient):
         else:
             path = '/'.join([self.ACCOUNTS_BASEURL, account, 'usage', 'local'])
         url = build_url(choice(self.list_hosts), path=path)
-        res = self._send_request(url, type_='GET')
+        res = self._send_request(url, method=HTTPMethod.GET)
         if res.status_code == codes.ok:
             return self._load_json_data(res)
         else:
@@ -486,7 +487,7 @@ class AccountClient(BaseClient):
         else:
             path = '/'.join([self.ACCOUNTS_BASEURL, account, 'usage', 'global'])
         url = build_url(choice(self.list_hosts), path=path)
-        res = self._send_request(url, type_='GET')
+        res = self._send_request(url, method=HTTPMethod.GET)
         if res.status_code == codes.ok:
             return self._load_json_data(res)
         else:
@@ -506,7 +507,7 @@ class AccountClient(BaseClient):
         """
         path = '/'.join([self.ACCOUNTS_BASEURL, account, 'usage/history', rse])
         url = build_url(choice(self.list_hosts), path=path)
-        res = self._send_request(url, type_='GET')
+        res = self._send_request(url, method=HTTPMethod.GET)
         if res.status_code == codes.ok:
             return next(self._load_json_data(res))
         else:
@@ -524,7 +525,7 @@ class AccountClient(BaseClient):
         """
         path = '/'.join([self.ACCOUNTS_BASEURL, account, 'attr/'])
         url = build_url(choice(self.list_hosts), path=path)
-        res = self._send_request(url, type_='GET')
+        res = self._send_request(url, method=HTTPMethod.GET)
         if res.status_code == codes.ok:
             return self._load_json_data(res)
         else:
@@ -548,7 +549,7 @@ class AccountClient(BaseClient):
         data = dumps({'key': key, 'value': value})
         path = '/'.join([self.ACCOUNTS_BASEURL, account, 'attr', key])
         url = build_url(choice(self.list_hosts), path=path)
-        res = self._send_request(url, type_='POST', data=data)
+        res = self._send_request(url, method=HTTPMethod.POST, data=data)
         if res.status_code == codes.created:
             return True
         else:
@@ -569,7 +570,7 @@ class AccountClient(BaseClient):
 
         path = '/'.join([self.ACCOUNTS_BASEURL, account, 'attr', key])
         url = build_url(choice(self.list_hosts), path=path)
-        res = self._send_request(url, type_='DEL', data=None)
+        res = self._send_request(url, method=HTTPMethod.DELETE, data=None)
         if res.status_code == codes.ok:
             return True
         else:

{rucio-38.3.0 → rucio-38.4.0}/lib/rucio/client/accountlimitclient.py

@@ -19,6 +19,7 @@ from urllib.parse import quote_plus
 from requests.status_codes import codes
 
 from rucio.client.baseclient import BaseClient, choice
+from rucio.common.constants import HTTPMethod
 from rucio.common.utils import build_url
 
 
@@ -123,7 +124,7 @@ class AccountLimitClient(BaseClient):
         path = '/'.join([self.ACCOUNTLIMIT_BASEURL, 'local', account, rse])
         url = build_url(choice(self.list_hosts), path=path)
 
-        r = self._send_request(url, type_='POST', data=data)
+        r = self._send_request(url, method=HTTPMethod.POST, data=data)
 
         if r.status_code == codes.created:
             return True
@@ -160,7 +161,7 @@ class AccountLimitClient(BaseClient):
         path = '/'.join([self.ACCOUNTLIMIT_BASEURL, 'local', account, rse])
         url = build_url(choice(self.list_hosts), path=path)
 
-        r = self._send_request(url, type_='DEL')
+        r = self._send_request(url, method=HTTPMethod.DELETE)
 
         if r.status_code == codes.ok:
             return True
@@ -196,7 +197,7 @@ class AccountLimitClient(BaseClient):
         path = '/'.join([self.ACCOUNTLIMIT_BASEURL, 'global', account, quote_plus(rse_expression)])
         url = build_url(choice(self.list_hosts), path=path)
 
-        r = self._send_request(url, type_='POST', data=data)
+        r = self._send_request(url, method=HTTPMethod.POST, data=data)
 
         if r.status_code == codes.created:
             return True
@@ -233,7 +234,7 @@ class AccountLimitClient(BaseClient):
         path = '/'.join([self.ACCOUNTLIMIT_BASEURL, 'global', account, quote_plus(rse_expression)])
         url = build_url(choice(self.list_hosts), path=path)
 
-        r = self._send_request(url, type_='DEL')
+        r = self._send_request(url, method=HTTPMethod.DELETE)
 
         if r.status_code == codes.ok:
             return True

{rucio-38.3.0 → rucio-38.4.0}/lib/rucio/client/baseclient.py

@@ -38,7 +38,7 @@ from requests.status_codes import codes
 from rucio import version
 from rucio.common import exception
 from rucio.common.config import config_get, config_get_bool, config_get_int, config_has_section
-from rucio.common.constants import DEFAULT_VO
+from rucio.common.constants import DEFAULT_VO, HTTPMethod
 from rucio.common.exception import CannotAuthenticate, ClientProtocolNotFound, ClientProtocolNotSupported, ConfigNotFound, MissingClientParameter, MissingModuleException, NoAuthInformation, ServerConnectionException
 from rucio.common.extra import import_extras
 from rucio.common.utils import build_url, get_tmp_dir, my_key_generator, parse_response, setup_logger, ssh_sign, wlcg_token_discovery
@@ -440,14 +440,14 @@ class BaseClient:
         self.logger.warning("Waiting {}s due to reason: {} ".format(sleep_time, reason))
         time.sleep(sleep_time)
 
-    def _send_request(self, url, headers=None, type_='GET', data=None, params=None, stream=False, get_token=False,
+    def _send_request(self, url, method, headers=None, data=None, params=None, stream=False, get_token=False,
                       cert=None, auth=None, verify=None):
         """
         Helper method to send requests to the rucio server. Gets a new token and retries if an unauthorized error is returned.
 
         :param url: the http url to use.
         :param headers: additional http headers to send.
-        :param type_: the http request type to use.
+        :param method: the http request type to use.
         :param data: post data.
         :param params: (optional) Dictionary or bytes to be sent in the url query string.
         :param get_token: (optional) if it is called from a _get_token function.
@@ -469,28 +469,28 @@ class BaseClient:
         if verify is None:
             verify = self.ca_cert or False  # Maybe unnecessary but make sure to convert "" -> False
 
-        self.logger.debug("HTTP request: %s %s" % (type_, url))
+        self.logger.debug("HTTP request: %s %s" % (method.value, url))
         for h, v in hds.items():
             if h == 'X-Rucio-Auth-Token':
                 v = "[hidden]"
             self.logger.debug("HTTP header:  %s: %s" % (h, v))
-        if type_ != "GET" and data:
+        if method != HTTPMethod.GET and data:
             text = self._reduce_data(data)
             self.logger.debug("Request data (length=%d): [%s]" % (len(data), text))
 
         result = None
         for retry in range(self.AUTH_RETRIES + 1):
             try:
-                if type_ == 'GET':
+                if method == HTTPMethod.GET:
                     result = self.session.get(url, headers=hds, verify=verify, timeout=self.timeout, params=params, stream=True, cert=cert, auth=auth)
-                elif type_ == 'PUT':
+                elif method == HTTPMethod.PUT:
                     result = self.session.put(url, headers=hds, data=data, verify=verify, timeout=self.timeout)
-                elif type_ == 'POST':
+                elif method == HTTPMethod.POST:
                     result = self.session.post(url, headers=hds, data=data, verify=verify, timeout=self.timeout, stream=stream)
-                elif type_ == 'DEL':
+                elif method == HTTPMethod.DELETE:
                     result = self.session.delete(url, headers=hds, data=data, verify=verify, timeout=self.timeout)
                 else:
-                    self.logger.debug("Unknown request type %s. Request was not sent" % (type_,))
+                    self.logger.debug("Unknown request type %s. Request was not sent" % (method,))
                     return None
                 self.logger.debug("HTTP Response: %s %s" % (result.status_code, result.reason))
                 if result.status_code in STATUS_CODES_TO_RETRY:
@@ -537,7 +537,7 @@ class BaseClient:
 
         url = build_url(self.auth_host, path='auth/userpass')
 
-        result = self._send_request(url, headers=headers, get_token=True)
+        result = self._send_request(url, method=HTTPMethod.GET, headers=headers, get_token=True)
 
         if not result:
             # result is either None or not OK.
@@ -590,7 +590,7 @@ class BaseClient:
             return False
 
         request_refresh_url = build_url(self.auth_host, path='auth/oidc_refresh')
-        refresh_result = self._send_request(request_refresh_url, get_token=True)
+        refresh_result = self._send_request(request_refresh_url,method=HTTPMethod.GET, get_token=True)
         if refresh_result.status_code == codes.ok:
             if 'X-Rucio-Auth-Token-Expires' not in refresh_result.headers or \
                     'X-Rucio-Auth-Token' not in refresh_result.headers:
@@ -644,7 +644,7 @@ class BaseClient:
         request_auth_url = build_url(self.auth_host, path='auth/oidc')
         # requesting authorization URL specific to the user & Rucio OIDC Client
         self.logger.debug("Initial auth URL request headers %s to files" % str(headers))
-        oidc_auth_res = self._send_request(request_auth_url, headers=headers, get_token=True)
+        oidc_auth_res = self._send_request(request_auth_url, method=HTTPMethod.GET, headers=headers, get_token=True)
         self.logger.debug("Response headers %s and text %s" % (str(oidc_auth_res.headers), str(oidc_auth_res.text)))
         # with the obtained authorization URL we will contact the Identity Provider to get to the login page
         if 'X-Rucio-OIDC-Auth-URL' not in oidc_auth_res.headers:
@@ -665,7 +665,7 @@ class BaseClient:
                                            \nthe Rucio authentication server for a token.")
                 print("----------------------------------------------")
                 while time.time() - start < timeout:
-                    result = self._send_request(auth_url, headers=headers, get_token=True)
+                    result = self._send_request(auth_url, method=HTTPMethod.GET, headers=headers, get_token=True)
                     if 'X-Rucio-Auth-Token' in result.headers and result.status_code == codes.ok:
                         break
                     time.sleep(2)
@@ -675,7 +675,7 @@ class BaseClient:
                 while count < 3:
                     fetchcode = input()
                     fetch_url = build_url(self.auth_host, path='auth/oidc_redirect', params=fetchcode)
-                    result = self._send_request(fetch_url, headers=headers, get_token=True)
+                    result = self._send_request(fetch_url, method=HTTPMethod.GET, headers=headers, get_token=True)
                     if 'X-Rucio-Auth-Token' in result.headers and result.status_code == codes.ok:
                         break
                     else:
@@ -688,11 +688,11 @@ class BaseClient:
                   + "your password with any 3rd party application, therefore, \n"  # NOQA: W503
                   + "we strongly discourage you from following this --oidc-auto approach.")  # NOQA: W503
             print("-------------------------------------------------------------------------")
-            auth_res = self._send_request(auth_url, get_token=True)
+            auth_res = self._send_request(auth_url, method=HTTPMethod.GET, get_token=True)
             # getting the login URL and logging in the user
             login_url = auth_res.url
             start = time.time()
-            result = self._send_request(login_url, type_='POST', data=userpass)
+            result = self._send_request(login_url, method=HTTPMethod.POST, data=userpass)
 
             # if the Rucio OIDC Client configuration does not match the one registered at the Identity Provider
             # the user will get an OAuth error
@@ -714,7 +714,7 @@ class BaseClient:
                 self.logger.warning('Automatically authorising request of the following info on behalf of user: %s',
                                     str(form_data))
                 # authorizing info request on behalf of the user until he/she revokes this authorization !
-                result = self._send_request(result.url, type_='POST', data=form_data)
+                result = self._send_request(result.url, method=HTTPMethod.POST, data=form_data)
 
         if not result:
             self.logger.error('Cannot retrieve authentication token!')
@@ -767,7 +767,7 @@ class BaseClient:
         else:
             cert = (client_cert, client_key)
 
-        result = self._send_request(url, get_token=True, cert=cert)
+        result = self._send_request(url, method=HTTPMethod.GET, get_token=True, cert=cert)
 
         # Note a response object for a failed request evaluates to false, so we cannot
         # use "not result" here
@@ -802,7 +802,7 @@ class BaseClient:
 
         url = build_url(self.auth_host, path='auth/ssh_challenge_token')
 
-        result = self._send_request(url, get_token=True)
+        result = self._send_request(url, method=HTTPMethod.GET, get_token=True)
 
         if not result:
             self.logger.error('cannot get ssh_challenge_token')
@@ -825,7 +825,7 @@ class BaseClient:
 
         url = build_url(self.auth_host, path='auth/ssh')
 
-        result = self._send_request(url, headers=headers, get_token=True)
+        result = self._send_request(url, method=HTTPMethod.GET, headers=headers, get_token=True)
 
         if not result:
             self.logger.error('Cannot retrieve authentication token!')
@@ -851,7 +851,7 @@ class BaseClient:
 
         url = build_url(self.auth_host, path='auth/gss')
 
-        result = self._send_request(url, get_token=True, auth=HTTPKerberosAuth())
+        result = self._send_request(url, method=HTTPMethod.GET, get_token=True, auth=HTTPKerberosAuth())
 
         if not result:
             self.logger.error('Cannot retrieve authentication token!')
@@ -876,12 +876,12 @@ class BaseClient:
         url = build_url(self.auth_host, path='auth/saml')
 
         result = None
-        saml_auth_result = self._send_request(url, get_token=True)
+        saml_auth_result = self._send_request(url, method=HTTPMethod.GET, get_token=True)
         if saml_auth_result.headers['X-Rucio-Auth-Token']:
             return saml_auth_result.headers['X-Rucio-Auth-Token']
         saml_auth_url = saml_auth_result.headers['X-Rucio-SAML-Auth-URL']
-        result = self._send_request(saml_auth_url, type_='POST', data=userpass, verify=False)
-        result = self._send_request(url, get_token=True)
+        result = self._send_request(saml_auth_url, method=HTTPMethod.POST, data=userpass, verify=False)
+        result = self._send_request(url, method=HTTPMethod.GET, get_token=True)
 
         if not result:
             self.logger.error('Cannot retrieve authentication token!')

{rucio-38.3.0 → rucio-38.4.0}/lib/rucio/client/configclient.py

@@ -18,6 +18,7 @@ from typing import Any, Optional
 from requests.status_codes import codes
 
 from rucio.client.baseclient import BaseClient, choice
+from rucio.common.constants import HTTPMethod
 from rucio.common.utils import build_url
 
 
@@ -54,7 +55,7 @@ class ConfigClient(BaseClient):
 
         url = build_url(choice(self.list_hosts), path=path)
 
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             return r.json()
         else:
@@ -90,7 +91,7 @@ class ConfigClient(BaseClient):
         Note:
         ------
         The format of the /config endpoint was recently changed. We migrated from performing a PUT on
-        "/config/<section>/<option>/<value>" to sending the parameters using a json-encoded body.
+        "/config/{section}/{option}/{value}" to sending the parameters using a json-encoded body.
         This was done to fix multiple un-wanted side effects related to how the middleware treats
         values encoded in a path.
         For a smooth transition, we allow both cases for now, but we should migrate to only passing
@@ -104,11 +105,11 @@ class ConfigClient(BaseClient):
                     option: value
                 }
             })
-            r = self._send_request(url, type_='POST', data=data)
+            r = self._send_request(url, method=HTTPMethod.POST, data=data)
         else:
             path = '/'.join([self.CONFIG_BASEURL, section, option, value])
             url = build_url(choice(self.list_hosts), path=path)
-            r = self._send_request(url, type_='PUT')
+            r = self._send_request(url, method=HTTPMethod.PUT)
 
         if r.status_code == codes.created:
             return True
@@ -140,7 +141,7 @@ class ConfigClient(BaseClient):
         path = '/'.join([self.CONFIG_BASEURL, section, option])
         url = build_url(choice(self.list_hosts), path=path)
 
-        r = self._send_request(url, type_='DEL')
+        r = self._send_request(url, method=HTTPMethod.DELETE)
 
         if r.status_code == codes.ok:
             return True
@@ -163,7 +164,7 @@ class ConfigClient(BaseClient):
         """
         path = '/'.join([self.CONFIG_BASEURL, section])
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='DEL')
+        r = self._send_request(url, method=HTTPMethod.DELETE)
 
         if r.status_code == codes.ok:
             return True

{rucio-38.3.0 → rucio-38.4.0}/lib/rucio/client/credentialclient.py

@@ -15,6 +15,7 @@
 from requests.status_codes import codes
 
 from rucio.client.baseclient import BaseClient, choice
+from rucio.common.constants import HTTPMethod
 from rucio.common.utils import build_url
 
 
@@ -60,7 +61,7 @@ class CredentialClient(BaseClient):
         params['op'] = operation
         params['url'] = url
         rurl = build_url(choice(self.list_hosts), path=path, params=params)
-        r = self._send_request(rurl, type_='GET')
+        r = self._send_request(rurl, method=HTTPMethod.GET)
 
         if r.status_code == codes.ok:
             return r.text