Skip to content

Commit b23c2f9

Browse files
committed
fix: hide hideous circular dependency with IdProviderFactory
1 parent 286c0d8 commit b23c2f9

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

src/DIRAC/Core/Tornado/Client/private/TornadoBaseClient.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@
5151
from DIRAC.Core.Utilities import Network
5252
from DIRAC.Core.Utilities.JEncode import decode, encode
5353

54-
from DIRAC.Resources.IdProvider.IdProviderFactory import IdProviderFactory
55-
from DIRAC.FrameworkSystem.private.authorization.utils.Tokens import getLocalTokenDict, writeTokenDictToTokenFile
5654

5755
# TODO CHRIS: refactor all the messy `discover` methods
5856
# I do not do it now because I want first to decide
@@ -249,6 +247,8 @@ def __discoverCredentialsToUse(self):
249247
self.kwargs[self.KW_USE_ACCESS_TOKEN] = self.__useAccessToken
250248

251249
if self.__useAccessToken:
250+
from DIRAC.Resources.IdProvider.IdProviderFactory import IdProviderFactory
251+
252252
result = IdProviderFactory().getIdProvider("DIRACCLI")
253253
if not result["OK"]:
254254
return result
@@ -531,6 +531,11 @@ def _request(self, retry=0, outputFile=None, **kwargs):
531531

532532
# Use access token?
533533
elif self.__useAccessToken:
534+
from DIRAC.FrameworkSystem.private.authorization.utils.Tokens import (
535+
getLocalTokenDict,
536+
writeTokenDictToTokenFile,
537+
)
538+
534539
# Read token from token environ variable or from token file
535540
result = getLocalTokenDict()
536541
if not result["OK"]:

0 commit comments

Comments
 (0)