Skip to content

Commit d08fec8

Browse files
authored
Merge pull request #6905 from atsareg/fix-rest-8
[8.0] Backport of the TornadoREST fix
2 parents e08076d + dc44a0f commit d08fec8

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/DIRAC/Core/Tornado/Server/TornadoREST.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
import os
77
import inspect
8+
from functools import partial
9+
from urllib.parse import unquote
10+
811
from tornado.escape import json_decode
912
from tornado.web import url as TornadoURL
10-
from urllib.parse import unquote
11-
from functools import partial
1213

13-
from DIRAC import gLogger
1414
from DIRAC.ConfigurationSystem.Client import PathFinder
15-
from DIRAC.Core.Tornado.Server.private.BaseRequestHandler import *
15+
from DIRAC.Core.Tornado.Server.private.BaseRequestHandler import BaseRequestHandler, set_attribute
1616

1717
# decorator to determine the path to access the target method
1818
location = partial(set_attribute, "location")
@@ -171,7 +171,7 @@ def _pre_initialize(cls) -> list:
171171
"""
172172
urls = []
173173
# Look for methods that are exported
174-
for prefix in [cls.METHOD_PREFIX] if cls.METHOD_PREFIX else cls.SUPPORTED_METHODS:
174+
for prefix in [cls.METHOD_PREFIX] if cls.METHOD_PREFIX else [f"{pref}_" for pref in cls.SUPPORTED_METHODS]:
175175
prefix = prefix.lower()
176176
for mName, mObj in inspect.getmembers(cls, lambda x: callable(x) and x.__name__.startswith(prefix)):
177177
methodName = mName[len(prefix) :]
@@ -341,4 +341,4 @@ def post_note(self, pos_only, /, standard, *, kwd_only):
341341
# Wrap argument with annotated type
342342
keywordArguments[name] = _type(value) if _type else value
343343

344-
return (positionalArguments, keywordArguments)
344+
return positionalArguments, keywordArguments

0 commit comments

Comments
 (0)