style: imports ordering

DIRACGrid · Aug 28, 2024 · e7a3edf · e7a3edf
1 parent 52e69e4
commit e7a3edf
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 359 deletions.
diff --git a/src/DIRAC/DataManagementSystem/Client/test/Test_FTS3Objects.py b/src/DIRAC/DataManagementSystem/Client/test/Test_FTS3Objects.py
@@ -2,25 +2,14 @@
 from unittest import mock
 
 import pytest
-import tempfile
-import errno
-import DIRAC
-
-from DIRAC.tests.Utilities.utils import generateDIRACConfig
 
-from DIRAC.ConfigurationSystem.private.ConfigurationClient import ConfigurationClient
-from DIRAC.ConfigurationSystem.Client.ConfigurationData import gConfigurationData
-from diraccfg import CFG
-from DIRAC.DataManagementSystem.private.FTS3Plugins.DefaultFTS3Plugin import DefaultFTS3Plugin
+import DIRAC
 from DIRAC import S_OK
 from DIRAC.Core.Utilities.DErrno import cmpError
-
-from DIRAC.Resources.Storage.StorageBase import StorageBase
-
-from DIRAC.DataManagementSystem.Client.FTS3Job import FTS3Job
 from DIRAC.DataManagementSystem.Client.FTS3File import FTS3File
-from DIRAC.DataManagementSystem.Client.FTS3Operation import FTS3Operation
-
+from DIRAC.DataManagementSystem.Client.FTS3Job import FTS3Job
+from DIRAC.Resources.Storage.StorageBase import StorageBase
+from DIRAC.tests.Utilities.utils import generateDIRACConfig
 
 DIRAC.gLogger.setLevel("DEBUG")
 # pylint: disable=redefined-outer-name

diff --git a/src/DIRAC/DataManagementSystem/Client/test/Test_SE.py b/src/DIRAC/DataManagementSystem/Client/test/Test_SE.py
diff --git a/src/DIRAC/DataManagementSystem/private/FTS3Plugins/test/Test_DefaultFTS3Plugin.py b/src/DIRAC/DataManagementSystem/private/FTS3Plugins/test/Test_DefaultFTS3Plugin.py
@@ -2,8 +2,8 @@
 
 import os
 import tempfile
+from unittest import mock
 
-import mock
 import pytest
 from diraccfg import CFG
 
@@ -343,10 +343,8 @@ def test_multiHop_specificLink(fts3Plugin):
     assert hopName == "CERN-RAW-CNAF-DST"
 
 
-def test_multiHop_specificSrc_baseSEDst(mocker, fts3Plugin):
+def test_multiHop_specificSrc_baseSEDst(fts3Plugin):
     """When we have a specific source and a baseSE dest"""
-    # mocker.patch("DIRAC.DataManagementSystem.private.FTS3Plugins.DefaultFTS3Plugin.StorageElement", return_value=mock.MagicMock())
-
     hopName = fts3Plugin.findMultiHopSEToCoverUpForWLCGFailure("CERN-RAW", "CNAF_MC-DST")
     assert hopName == "CERN-RAW-CNAF-Disk"
 

diff --git a/src/DIRAC/Interfaces/API/DiracAdmin.py b/src/DIRAC/Interfaces/API/DiracAdmin.py
@@ -6,20 +6,19 @@
 """
 import os
 
-from DIRAC import gLogger, gConfig, S_OK, S_ERROR
-from DIRAC.Core.Utilities.PromptUser import promptUser
-from DIRAC.Core.Base.API import API
+from DIRAC import S_ERROR, S_OK, gConfig, gLogger
 from DIRAC.ConfigurationSystem.Client.CSAPI import CSAPI
 from DIRAC.ConfigurationSystem.Client.Helpers.Registry import getVOForGroup
+from DIRAC.Core.Base.API import API
 from DIRAC.Core.Security.ProxyInfo import getProxyInfo
-from DIRAC.FrameworkSystem.Client.ProxyManagerClient import gProxyManager
+from DIRAC.Core.Utilities.PromptUser import promptUser
 from DIRAC.FrameworkSystem.Client.NotificationClient import NotificationClient
+from DIRAC.FrameworkSystem.Client.ProxyManagerClient import gProxyManager
 from DIRAC.ResourceStatusSystem.Client.ResourceStatusClient import ResourceStatusClient
-from DIRAC.ResourceStatusSystem.Client.ResourceStatus import ResourceStatus
 from DIRAC.ResourceStatusSystem.Client.SiteStatus import SiteStatus
 from DIRAC.WorkloadManagementSystem.Client.JobManagerClient import JobManagerClient
-from DIRAC.WorkloadManagementSystem.Client.WMSAdministratorClient import WMSAdministratorClient
 from DIRAC.WorkloadManagementSystem.Client.PilotManagerClient import PilotManagerClient
+from DIRAC.WorkloadManagementSystem.Client.WMSAdministratorClient import WMSAdministratorClient
 
 voName = ""
 ret = getProxyInfo(disableVOMS=True)