From 19f47fb0946ab7ce147c4f6b466596bf16d124aa Mon Sep 17 00:00:00 2001 From: Christophe Haen Date: Fri, 5 Aug 2022 16:26:12 +0200 Subject: [PATCH] refactor (Resources): remove six --- src/DIRAC/Resources/Storage/GFAL2_SRM2Storage.py | 4 ++-- src/DIRAC/Resources/Storage/GFAL2_StorageBase.py | 6 +++--- src/DIRAC/Resources/Storage/RFIOStorage.py | 3 +-- src/DIRAC/Resources/Storage/StorageElement.py | 6 +++--- src/DIRAC/Resources/Storage/StorageFactory.py | 4 ++-- src/DIRAC/Resources/Storage/Utilities.py | 6 +++--- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/DIRAC/Resources/Storage/GFAL2_SRM2Storage.py b/src/DIRAC/Resources/Storage/GFAL2_SRM2Storage.py index 18784282990..ced2823bb42 100644 --- a/src/DIRAC/Resources/Storage/GFAL2_SRM2Storage.py +++ b/src/DIRAC/Resources/Storage/GFAL2_SRM2Storage.py @@ -8,7 +8,7 @@ """ # pylint: disable=invalid-name -import six + import errno import json @@ -106,7 +106,7 @@ def getTransportURL(self, path, protocols=False): listProtocols = self.protocolsList if not listProtocols: return S_ERROR("GFAL2_SRM2Storage.getTransportURL: No local protocols defined and no defaults found.") - elif isinstance(protocols, six.string_types): + elif isinstance(protocols, str): listProtocols = [protocols] elif isinstance(protocols, list): listProtocols = protocols diff --git a/src/DIRAC/Resources/Storage/GFAL2_StorageBase.py b/src/DIRAC/Resources/Storage/GFAL2_StorageBase.py index d923168cfad..4f230d11460 100644 --- a/src/DIRAC/Resources/Storage/GFAL2_StorageBase.py +++ b/src/DIRAC/Resources/Storage/GFAL2_StorageBase.py @@ -21,7 +21,7 @@ # # imports from past.builtins import long -import six + import os import datetime import errno @@ -839,7 +839,7 @@ def _prestageSingleFileStatus(self, path, token): log = self.log.getSubLogger("GFAL2_StorageBase._prestageSingleFileStatus") log.debug("Checking prestage file status for %s" % path) # also allow int as token - converting them to strings - if not isinstance(token, six.string_types): + if not isinstance(token, str): token = str(token) try: @@ -967,7 +967,7 @@ def _releaseSingleFile(self, path, token): """ log = self.log.getSubLogger("GFAL2_StorageBase._releaseSingleFile") log.debug("Attempting to release single file: %s" % path) - if not isinstance(token, six.string_types): + if not isinstance(token, str): token = str(token) try: self.ctx.set_opt_boolean("BDII", "ENABLE", True) diff --git a/src/DIRAC/Resources/Storage/RFIOStorage.py b/src/DIRAC/Resources/Storage/RFIOStorage.py index 3caf0830397..dc4dd70f400 100755 --- a/src/DIRAC/Resources/Storage/RFIOStorage.py +++ b/src/DIRAC/Resources/Storage/RFIOStorage.py @@ -4,7 +4,6 @@ import os import time -import six from DIRAC import gLogger, S_OK, S_ERROR from DIRAC.Resources.Storage.Utilities import checkArgumentFormat @@ -981,7 +980,7 @@ def getDirectorySize(self, path): def __checkArgumentFormat(self, path): """FIXME: Can be replaced by a generic checkArgumentFormat Utility""" - if isinstance(path, six.string_types): + if isinstance(path, str): urls = [path] elif isinstance(path, list): urls = path diff --git a/src/DIRAC/Resources/Storage/StorageElement.py b/src/DIRAC/Resources/Storage/StorageElement.py index 5e8931f9616..552a5639b2b 100755 --- a/src/DIRAC/Resources/Storage/StorageElement.py +++ b/src/DIRAC/Resources/Storage/StorageElement.py @@ -2,7 +2,7 @@ """ # # custom duty -import six + from copy import deepcopy import datetime import errno @@ -959,7 +959,7 @@ def getURL(self, lfn, protocol=False, replicaDict=None): protocols = self.turlProtocols elif isinstance(protocol, list): protocols = protocol - elif isinstance(protocol, six.string_types): + elif isinstance(protocol, str): protocols = [protocol] self.methodName = "getTransportURL" @@ -1055,7 +1055,7 @@ def __filterPlugins(self, methodName, protocols=None, inputProtocol=None): "Filtering plugins for %s (protocol = %s ; inputProtocol = %s)" % (methodName, protocols, inputProtocol) ) - if isinstance(protocols, six.string_types): + if isinstance(protocols, str): protocols = [protocols] pluginsToUse = [] diff --git a/src/DIRAC/Resources/Storage/StorageFactory.py b/src/DIRAC/Resources/Storage/StorageFactory.py index bf7b045d435..1664b93186f 100755 --- a/src/DIRAC/Resources/Storage/StorageFactory.py +++ b/src/DIRAC/Resources/Storage/StorageFactory.py @@ -11,7 +11,7 @@ getStorages() This takes a DIRAC SE definition and creates storage stubs for the protocols found in the CS. By providing an optional list of protocols it is possible to limit the created stubs. """ -import six + from DIRAC import gLogger, gConfig, S_OK, S_ERROR from DIRAC.ResourceStatusSystem.Client.ResourceStatus import ResourceStatus from DIRAC.ConfigurationSystem.Client.Helpers.Path import cfgPath @@ -86,7 +86,7 @@ def getStorages(self, storageName, protocolSections=None, hideExceptions=False): self.storages = {} if protocolSections is None: protocolSections = [] - elif isinstance(protocolSections, six.string_types): + elif isinstance(protocolSections, str): protocolSections = [protocolSections] if not self.vo: gLogger.warn("No VO information available") diff --git a/src/DIRAC/Resources/Storage/Utilities.py b/src/DIRAC/Resources/Storage/Utilities.py index 84c486dfa9a..4ad14307b4b 100644 --- a/src/DIRAC/Resources/Storage/Utilities.py +++ b/src/DIRAC/Resources/Storage/Utilities.py @@ -1,6 +1,6 @@ """ Storage plug-ins related utilities """ -import six + import errno from DIRAC import S_OK, S_ERROR @@ -9,10 +9,10 @@ def checkArgumentFormat(path): """returns {'/this/is/an/lfn.1':False, '/this/is/an/lfn.2':False ...}""" - if isinstance(path, six.string_types): + if isinstance(path, str): return S_OK({path: False}) elif isinstance(path, list): - return S_OK(dict([(url, False) for url in path if isinstance(url, six.string_types)])) + return S_OK(dict([(url, False) for url in path if isinstance(url, str)])) elif isinstance(path, dict): returnDict = path.copy() return S_OK(returnDict)