Skip to content

Commit

Permalink
Merge pull request DIRACGrid#7815 from fstagni/cherry-pick-2-5ad2fc45…
Browse files Browse the repository at this point in the history
…9-integration

[sweep:integration] fix: new pylint version fixes
  • Loading branch information
chrisburr authored Oct 3, 2024
2 parents 2f80ae1 + c9dfb64 commit 5179b11
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 4 deletions.
14 changes: 14 additions & 0 deletions release.notes
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,20 @@ FIX: (#7649) added log headers to InputDataResolution modules
CHANGE: (#7629) add jobGroup to job parameters
FIX: (#7584) ServerUtils: prevent getPilotAgentsDB from returning None
FIX: (#7576) Fix potential circular import in WorkflowReader. Mostly seen in the creation of the documentation.
FIX: (#7787) added a 30s gfal2 timeout for downloading the SRR

*TransformationSystem

FIX: (#7741) RequestTaskAgent only considers requests in final states, and consider files in intermediate state as problematic (https://github.com/DIRACGrid/DIRAC/issues/7116)
NEW: (#7741) RequestTaskAgent uses getBulkRequestStatus instead of getRequestStatus
RMS: (#7741)
NEW: (#7741) implement getRequestStatus

[v8.0.52]

*ResourceStatusSystem

FIX: (#7800) use always a from address (from Operations ResourceStatus/Config/FromAddress ) when sending email notifications, to avoid "spoofing" domains restrictions

*WorkloadManagement

Expand Down
4 changes: 2 additions & 2 deletions src/DIRAC/Core/Tornado/Server/HandlerManager.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
This module contains the necessary tools to discover and load
the handlers for serving HTTPS
"""
from DIRAC import gConfig, gLogger, S_ERROR, S_OK
from DIRAC import S_ERROR, S_OK, gConfig, gLogger
from DIRAC.ConfigurationSystem.Client import PathFinder
from DIRAC.Core.Base.private.ModuleLoader import ModuleLoader

Expand Down Expand Up @@ -121,7 +121,7 @@ def __load(self, instances, componentType, pathFinder):
# see DIRAC.Core.Tornado.Server.private.BaseRequestHandler for more details
# this method should return a list of routes associated with the handler, it is a regular expressions
# see https://www.tornadoweb.org/en/stable/routing.html#tornado.routing.URLSpec, ``pattern`` argument.
urls = handler._BaseRequestHandler__pre_initialize()
urls = handler._BaseRequestHandler__pre_initialize() # pylint: disable=no-member

# First of all check if we can find route
if not urls:
Expand Down
2 changes: 1 addition & 1 deletion src/DIRAC/Core/Tornado/Server/TornadoServer.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

import tornado.iostream

tornado.iostream.SSLIOStream.configure(
tornado.iostream.SSLIOStream.configure( # pylint: disable=no-member
"tornado_m2crypto.m2iostream.M2IOStream"
) # pylint: disable=wrong-import-position

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -952,7 +952,7 @@ async def __execute(self, *args, **kwargs): # pylint: disable=arguments-differ
# you need to define the finish_<methodName> method.
# This method will be started after _executeMethod is completed.
elif callable(finishFunc := getattr(self, f"finish_{self.__methodName}", None)):
finishFunc()
finishFunc() # pylint: disable=not-callable

# In case nothing is returned
elif self.__result is None:
Expand Down

0 comments on commit 5179b11

Please sign in to comment.