From f79da756103d940874ff040dae1b060e5ca35549 Mon Sep 17 00:00:00 2001 From: Frank Winklmeier <fwinkl@cern> Date: Mon, 26 Oct 2020 12:14:20 +0100 Subject: [PATCH] AtlasCollectionTools: flake8 fixes --- .../AtlasCollectionTools/python/countGuidsClient.py | 4 +--- .../AtlasCollectionTools/python/eventLookupClient.py | 7 ++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Database/AthenaPOOL/AtlasCollectionTools/python/countGuidsClient.py b/Database/AthenaPOOL/AtlasCollectionTools/python/countGuidsClient.py index b33d75226a8..3467aac7e69 100755 --- a/Database/AthenaPOOL/AtlasCollectionTools/python/countGuidsClient.py +++ b/Database/AthenaPOOL/AtlasCollectionTools/python/countGuidsClient.py @@ -1,8 +1,6 @@ # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration -from __future__ import print_function - -import urllib, re, string, os, time +import re from eventLookupClient import eventLookupClient # client for countGuids Athenaeum service diff --git a/Database/AthenaPOOL/AtlasCollectionTools/python/eventLookupClient.py b/Database/AthenaPOOL/AtlasCollectionTools/python/eventLookupClient.py index e7752f91236..b777ff5d1b0 100755 --- a/Database/AthenaPOOL/AtlasCollectionTools/python/eventLookupClient.py +++ b/Database/AthenaPOOL/AtlasCollectionTools/python/eventLookupClient.py @@ -1,7 +1,5 @@ # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration -from __future__ import print_function - import urllib, re, string, os, time from future import standard_library @@ -91,7 +89,7 @@ class eventLookupClient: for run_ev in inputEvents: runs_events += sep + run_ev[0] + " " + run_ev[1] sep = "\n" - runs.add(run_ev[0]); + runs.add(run_ev[0]) if asyncFlag is None: if len(runs) > 50 or len(inputEvents) > 1000: @@ -175,7 +173,6 @@ class eventLookupClient: runs_events += sep + run_ev[0] + " " + run_ev[1] sep = "\n" - tagtype = 'TAG' args = ' -F "runs_events=' + runs_events +'"' if tokens != "": args = args + ' --form-string "tokens=' + tokens +'"' if stream != "": args = args + ' --form-string "stream=' + stream +'"' @@ -263,7 +260,7 @@ class eventLookupClient: error1 = "You may try selectuing a different worker host. Use debug option to see the entire output" # check for errors if not output: output = self.output - if type(output) == type('str'): output = output.split('\n') + if isinstance(output, str): output = output.split('\n') for line in output: if re.search("certificate expired", line): print ("Your CA certificate proxy may have expired. The returned error is:\n" + line) -- GitLab