Skip to content

Commit 49ec034

Browse files
fstagnifstagni
committed
style: several minor simplifications
1 parent 385126f commit 49ec034

File tree

9 files changed

+25
-59
lines changed

9 files changed

+25
-59
lines changed

‎src/DIRAC/Core/Base/API.py‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
import pprint
44
import sys
55

6-
from DIRAC import gLogger, gConfig, S_OK, S_ERROR
7-
from DIRAC.Core.Security.ProxyInfo import getProxyInfo, formatProxyInfoAsString
8-
from DIRAC.Core.Utilities.Version import getCurrentVersion
6+
from DIRAC import S_ERROR, S_OK, gLogger
97
from DIRAC.ConfigurationSystem.Client.Helpers.Registry import getDNForUsername
108
from DIRAC.ConfigurationSystem.Client.Helpers.Resources import getSites
11-
12-
COMPONENT_NAME = "API"
9+
from DIRAC.Core.Security.ProxyInfo import formatProxyInfoAsString, getProxyInfo
10+
from DIRAC.Core.Utilities.Version import getCurrentVersion
1311

1412

1513
def _printFormattedDictList(dictList, fields, uniqueField, orderBy):
@@ -60,8 +58,7 @@ class API:
6058
def __init__(self):
6159
"""c'tor"""
6260
self._printFormattedDictList = _printFormattedDictList
63-
self.log = gLogger.getSubLogger(COMPONENT_NAME)
64-
self.section = COMPONENT_NAME
61+
self.log = gLogger.getSubLogger(self.__class__.__name__)
6562
self.pPrint = pprint.PrettyPrinter()
6663
# Global error dictionary
6764
self.errorDict = {}

‎src/DIRAC/Interfaces/API/Dirac.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@
4747
from DIRAC.WorkloadManagementSystem.Client.SandboxStoreClient import SandboxStoreClient
4848
from DIRAC.WorkloadManagementSystem.Client.WMSClient import WMSClient
4949

50-
COMPONENT_NAME = "DiracAPI"
51-
5250

5351
def parseArguments(args):
5452
argList = []

‎src/DIRAC/Interfaces/API/DiracAdmin.py‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
if ret["OK"] and "group" in ret["Value"]:
2626
voName = getVOForGroup(ret["Value"]["group"])
2727

28-
COMPONENT_NAME = "/Interfaces/API/DiracAdmin"
29-
3028

3129
class DiracAdmin(API):
3230
"""Administrative functionalities"""
@@ -38,11 +36,6 @@ def __init__(self):
3836

3937
self.csAPI = CSAPI()
4038

41-
self.dbg = False
42-
if gConfig.getValue(self.section + "/LogLevel", "DEBUG") == "DEBUG":
43-
self.dbg = True
44-
45-
self.scratchDir = gConfig.getValue(self.section + "/ScratchDir", "/tmp")
4639
self.currentDir = os.getcwd()
4740
self.sitestatus = SiteStatus()
4841

‎src/DIRAC/Interfaces/API/Job.py‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,25 @@
2222
2323
Note that several executables can be provided and wil be executed sequentially.
2424
"""
25-
import re
2625
import os
26+
import re
2727
import shlex
28-
2928
from io import StringIO
3029
from urllib.parse import quote
31-
from pathlib import Path
3230

3331
from DIRAC import S_OK, gLogger
32+
from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
33+
from DIRAC.ConfigurationSystem.Client.Helpers.Registry import getVOForGroup
34+
from DIRAC.ConfigurationSystem.Client.Helpers.Resources import getCESiteMapping, getDIRACPlatforms
3435
from DIRAC.Core.Base.API import API
3536
from DIRAC.Core.Security.ProxyInfo import getProxyInfo
36-
from DIRAC.Core.Workflow.Parameter import Parameter
37-
from DIRAC.Core.Workflow.Workflow import Workflow
3837
from DIRAC.Core.Utilities.ClassAd.ClassAdLight import ClassAd
39-
from DIRAC.Core.Utilities.Subprocess import systemCall
4038
from DIRAC.Core.Utilities.List import uniqueElements
41-
from DIRAC.Core.Utilities.ObjectLoader import ObjectLoader
42-
from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
43-
from DIRAC.ConfigurationSystem.Client.Helpers.Registry import getVOForGroup
44-
from DIRAC.ConfigurationSystem.Client.Helpers.Resources import getCESiteMapping, getDIRACPlatforms
39+
from DIRAC.Core.Utilities.Subprocess import systemCall
40+
from DIRAC.Core.Workflow.Parameter import Parameter
41+
from DIRAC.Core.Workflow.Workflow import Workflow
4542
from DIRAC.Interfaces.API.Dirac import Dirac
46-
from DIRAC.Workflow.Utilities.Utils import getStepDefinition, addStepToWorkflow
47-
48-
49-
COMPONENT_NAME = "/Interfaces/API/Job"
43+
from DIRAC.Workflow.Utilities.Utils import addStepToWorkflow, getStepDefinition
5044

5145

5246
class BadJobParameterError(ValueError):

‎src/DIRAC/TransformationSystem/Client/TaskManager.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@
66

77
import time
88

9-
from DIRAC import S_OK, S_ERROR, gLogger
10-
from DIRAC.TransformationSystem.Client.TransformationClient import TransformationClient
9+
from DIRAC import S_ERROR, S_OK, gLogger
1110
from DIRAC.TransformationSystem.Agent.TransformationAgentsUtilities import TransformationAgentsUtilities
12-
13-
COMPONENT_NAME = "TaskManager"
11+
from DIRAC.TransformationSystem.Client.TransformationClient import TransformationClient
1412

1513

1614
class TaskBase(TransformationAgentsUtilities):

‎src/DIRAC/TransformationSystem/Client/Transformation.py‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,14 @@
44
"""
55
import json
66

7-
from DIRAC import gLogger, gConfig, S_OK, S_ERROR
7+
from DIRAC import S_ERROR, S_OK, gConfig, gLogger
8+
from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
9+
from DIRAC.Core.Base.API import API
810
from DIRAC.Core.Utilities.JEncode import encode
911
from DIRAC.Core.Utilities.PromptUser import promptUser
10-
from DIRAC.Core.Base.API import API
12+
from DIRAC.RequestManagementSystem.Client.Operation import Operation
1113
from DIRAC.TransformationSystem.Client.BodyPlugin.BaseBody import BaseBody
1214
from DIRAC.TransformationSystem.Client.TransformationClient import TransformationClient
13-
from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
14-
from DIRAC.RequestManagementSystem.Client.Operation import Operation
15-
16-
COMPONENT_NAME = "Transformation"
1715

1816

1917
class Transformation(API):

‎src/DIRAC/WorkloadManagementSystem/Client/DownloadInputData.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
from DIRAC.Resources.Storage.StorageElement import StorageElement
1313
from DIRAC.WorkloadManagementSystem.Client.JobStateUpdateClient import JobStateUpdateClient
1414

15-
COMPONENT_NAME = "DownloadInputData"
16-
1715

1816
def _isCached(lfn, seName):
1917
result = returnSingleResult(StorageElement(seName).getFileMetadata(lfn))
@@ -137,7 +135,7 @@ def execute(self, dataToResolve=None):
137135
if not result["Value"]:
138136
self.log.warn("Not enough disk space available for download", f"{result['Value']} / {totalSize} bytes")
139137
self.__setJobParam(
140-
COMPONENT_NAME,
138+
self.__class__.__name__,
141139
f"Not enough disk space available for download: {result['Value']} / {totalSize} bytes",
142140
)
143141
return S_OK({"Failed": self.inputData, "Successful": {}})
@@ -216,7 +214,7 @@ def execute(self, dataToResolve=None):
216214
report += "\n".join(failedReplicas)
217215

218216
if report:
219-
self.__setJobParam(COMPONENT_NAME, report)
217+
self.__setJobParam(self.__class__.__name__, report)
220218

221219
return S_OK({"Successful": resolvedData, "Failed": failedReplicas})
222220

‎src/DIRAC/WorkloadManagementSystem/Client/InputDataResolution.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77
for applications.
88
"""
99
import DIRAC
10-
from DIRAC import S_OK, S_ERROR, gLogger, gConfig
10+
from DIRAC import S_ERROR, S_OK, gConfig, gLogger
11+
from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
1112
from DIRAC.Core.Utilities.ObjectLoader import ObjectLoader
1213
from DIRAC.WorkloadManagementSystem.Client.PoolXMLSlice import PoolXMLSlice
13-
from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
1414

15-
COMPONENT_NAME = "InputDataResolution"
1615
CREATE_CATALOG = False
1716

1817

@@ -22,8 +21,7 @@ class InputDataResolution:
2221
def __init__(self, argumentsDict):
2322
"""Standard constructor"""
2423
self.arguments = argumentsDict
25-
self.name = COMPONENT_NAME
26-
self.log = gLogger.getSubLogger(self.name)
24+
self.log = gLogger.getSubLogger(self.__class__.__name__)
2725
op = Operations()
2826
self.arguments.setdefault("Configuration", {})["AllReplicas"] = op.getValue(
2927
"InputDataPolicy/AllReplicas", False

‎src/DIRAC/WorkloadManagementSystem/Client/PoolXMLSlice.py‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,16 @@
55
"""
66
import os
77

8-
from DIRAC import S_OK, S_ERROR, gLogger
8+
from DIRAC import S_ERROR, S_OK, gLogger
99
from DIRAC.Resources.Catalog.PoolXMLCatalog import PoolXMLCatalog
1010

11-
COMPONENT_NAME = "PoolXMLSlice"
12-
1311

1412
class PoolXMLSlice:
15-
#############################################################################
1613
def __init__(self, catalogName):
1714
"""Standard constructor"""
1815
self.fileName = catalogName
19-
self.name = COMPONENT_NAME
20-
self.log = gLogger.getSubLogger(self.name)
16+
self.log = gLogger.getSubLogger(self.__class__.__name__)
2117

22-
#############################################################################
2318
def execute(self, dataDict):
2419
"""Given a dictionary of resolved input data, this will creates a POOL XML slice."""
2520
poolXMLCatName = self.fileName
@@ -61,6 +56,3 @@ def execute(self, dataDict):
6156
return S_ERROR("Exception during construction of POOL XML slice")
6257

6358
return S_OK("POOL XML Slice created")
64-
65-
66-
# EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#

0 commit comments

Comments
 (0)