Update BKQuery.py

ganga-devs · May 24, 2024 · 2a9af15 · 2a9af15
1 parent 46baeae
commit 2a9af15
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/ganga/GangaLHCb/Lib/LHCbDataset/BKQuery.py b/ganga/GangaLHCb/Lib/LHCbDataset/BKQuery.py
@@ -1,12 +1,9 @@
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
-import os
-import datetime
 from GangaCore.Core.exceptions import GangaException
 from GangaCore.GPIDev.Schema import Schema, Version, SimpleItem, ComponentItem
 from GangaCore.GPIDev.Base import GangaObject
-from GangaCore.GPIDev.Base.Proxy import isType, stripProxy, addProxy
+from GangaCore.GPIDev.Base.Proxy import isType, addProxy
 from GangaCore.GPIDev.Credentials import require_credential
-from GangaDirac.Lib.Credentials.DiracProxy import DiracProxy
 from GangaDirac.Lib.Backends.DiracUtils import get_result
 from GangaDirac.Lib.Utilities.DiracUtilities import GangaDiracError
 from GangaDirac.Lib.Files.DiracFile import DiracFile
@@ -125,12 +122,12 @@ def getDatasetMetadata(self):
                 msg = 'selection not supported for type="%s".' % self.type
                 raise GangaException(msg)
         cmd = "getDataset('%s','%s','%s','%s','%s','%s', '%s')" % (self.path, self.dqflag,
-                                                                   self.type, self.startDate, self.endDate, self.selection, self.SMOG2)
+                          self.type, self.startDate, self.endDate, self.selection, self.SMOG2)
         from GangaCore.GPIDev.Lib.GangaList.GangaList import GangaList
         knownLists = [tuple, list, GangaList]
         if isType(self.dqflag, knownLists):
             cmd = "getDataset('%s',%s,'%s','%s','%s','%s', '%s')" % (self.path, self.dqflag,
-                                                                     self.type, self.startDate, self.endDate, self.selection, self.SMOG2)
+                              self.type, self.startDate, self.endDate, self.selection, self.SMOG2)
 
         try:
             value = get_result(cmd, 'BK query error.', credential_requirements=self.credential_requirements)
@@ -168,7 +165,7 @@ def getDataset(self, compressed=True, SE=None):
                 msg = 'selection not supported for type="%s".' % self.type
                 raise GangaException(msg)
         cmd = "getDataset('%s','%s','%s','%s','%s','%s', %s)" % (self.path, self.dqflag,
-                                                                 self.type, self.startDate, self.endDate, self.selection, self.SMOG2)
+                          self.type, self.startDate, self.endDate, self.selection, self.SMOG2)
         from GangaCore.GPIDev.Lib.GangaList.GangaList import GangaList
         knownLists = [tuple, list, GangaList]
         if isType(self.dqflag, knownLists):
@@ -218,10 +215,14 @@ def getDataset(self, compressed=True, SE=None):
                     break
             if all_archived and not self.ignore_archived:
                 raise GangaDiracError(
-                    "All the files are only available on archive SEs. It is likely the data set has been archived. Contact data management to request that it be staged")
+                    "All the files are only available on archive SEs.
+                     It is likely the data set has been archived.
+                     Contact data management to request that it be staged")
             elif all_archived:
                 logger.warning(
-                    "All the files are only available on archive SEs. It is likely the data set has been archived. Contact data management to request that it be staged")
+                    "All the files are only available on archive SEs. 
+                     It is likely the data set has been archived. 
+                     Contact data management to request that it be staged")
 
         if compressed:
             ds = LHCbCompressedDataset(files)
@@ -293,7 +294,7 @@ def getDatasetMetadata(self):
         cmd = 'bkQueryDict(%s)' % self.dict
         try:
             value = get_result(cmd, 'BK query error.', credential_requirements=self.credential_requirements)
-        except GangaDiracError as err:
+        except GangaDiracError:
             return {'OK': False, 'Value': {}}
 
         files = []