- rename according to common python conventions

- fix warnings
- organize imports

Author: Barthelemy

Framework/script/RepoCleaner/qcrepocleaner/Ccdb.py

@@ -159,7 +159,7 @@ def delete_version(self, version: ObjectVersion):
             r = requests.delete(url_delete, headers=headers)
             r.raise_for_status()
             self.counter_deleted += 1
-        except requests.exceptions.RequestException as e:
+        except requests.exceptions.RequestException:
             logging.error(f"Exception in deleteVersion: {traceback.format_exc()}")
 
     @dryable.Dryable()
@@ -176,7 +176,7 @@ def move_version(self, version: ObjectVersion, to_path: str):
             r = requests.request("MOVE", url_move, headers=headers)
             r.raise_for_status()
             self.counter_deleted += 1
-        except requests.exceptions.RequestException as e:
+        except requests.exceptions.RequestException:
             logging.error(f"Exception in moveVersion: {traceback.format_exc()}")
 
     @dryable.Dryable()
@@ -202,7 +202,7 @@ def update_validity(self, version: ObjectVersion, valid_from: int, valid_to: int
             r = requests.put(full_path, headers=headers)
             r.raise_for_status()
             self.counter_validity_updated += 1
-        except requests.exceptions.RequestException as e:  
+        except requests.exceptions.RequestException:
             logging.error(f"Exception in updateValidity: {traceback.format_exc()}")
 
     @dryable.Dryable()
@@ -219,7 +219,7 @@ def update_metadata(self, version: ObjectVersion, metadata):
             headers = {'Connection': 'close'}
             r = requests.put(full_path, headers=headers)
             r.raise_for_status()
-        except requests.exceptions.RequestException as e:
+        except requests.exceptions.RequestException:
             logging.error(f"Exception in updateMetadata: {traceback.format_exc()}")
 
     @dryable.Dryable()

Framework/script/RepoCleaner/qcrepocleaner/o2-qc-repo-cleaner

@@ -277,6 +277,7 @@ def store_crucial_log(message):
     try:
         f = open(logs_filename, "a")
         f.write(message+"\n")
+        f.close()
     except IOError as e:
         logging.error(f"Could not write crucial log to {logs_filename} : {e}")
 

Framework/script/RepoCleaner/qcrepocleaner/o2-qc-repo-delete-not-in-runs

@@ -1,11 +1,13 @@
 #!/usr/bin/env python3
 
-import logging
 import argparse
+import csv
+import logging
+
 import dryable
-from qcrepocleaner.Ccdb import Ccdb, ObjectVersion
+
+from qcrepocleaner.Ccdb import Ccdb
 from qcrepocleaner.binUtils import prepare_main_logger
-import csv
 
 
 def parseArgs():

Framework/script/RepoCleaner/qcrepocleaner/o2-qc-repo-delete-objects

@@ -1,8 +1,10 @@
 #!/usr/bin/env python3
 
-import logging
 import argparse
+import logging
+
 import dryable
+
 from qcrepocleaner.Ccdb import Ccdb
 from qcrepocleaner.binUtils import prepare_main_logger
 

Framework/script/RepoCleaner/qcrepocleaner/o2-qc-repo-delete-objects-in-runs

@@ -1,12 +1,13 @@
 #!/usr/bin/env python3
 
-import logging
 import argparse
+import csv
+import logging
+
 import dryable
-import time
-from qcrepocleaner.Ccdb import Ccdb, ObjectVersion
+
+from qcrepocleaner.Ccdb import Ccdb
 from qcrepocleaner.binUtils import prepare_main_logger
-import csv
 
 
 def parseArgs():

Framework/script/RepoCleaner/qcrepocleaner/o2-qc-repo-delete-time-interval

@@ -1,8 +1,10 @@
 #!/usr/bin/env python3
 
-import logging
 import argparse
+import logging
+
 import dryable
+
 from qcrepocleaner.Ccdb import Ccdb
 from qcrepocleaner.binUtils import prepare_main_logger
 

Framework/script/RepoCleaner/qcrepocleaner/o2-qc-repo-find-objects-less-versions-than

@@ -1,15 +1,13 @@
 #!/usr/bin/env python3
 
-import logging
 import argparse
-import time
+import logging
 
 from qcrepocleaner import binUtils
 from qcrepocleaner.Ccdb import Ccdb
-import sys
-import datetime
 
-def parseArgs():
+
+def parse_args():
     """Parse the arguments passed to the script."""
     logging.info("Parsing arguments")
     parser = argparse.ArgumentParser(description='Identify the objects that have less than X versions.')
@@ -57,7 +55,7 @@ def main():
     binUtils.prepare_main_logger()
 
     # Parse arguments
-    args = parseArgs()
+    args = parse_args()
     logging.getLogger().setLevel(int(args.log_level))
 
     run(args)

Framework/script/RepoCleaner/qcrepocleaner/o2-qc-repo-find-objects-not-updated

@@ -1,15 +1,14 @@
 #!/usr/bin/env python3
 
-import logging
 import argparse
-import time
+import datetime
+import logging
 
 from qcrepocleaner import binUtils
 from qcrepocleaner.Ccdb import Ccdb
-import sys
-import datetime
 
-def parseArgs():
+
+def parse_args():
     """Parse the arguments passed to the script."""
     logging.info("Parsing arguments")
     parser = argparse.ArgumentParser(description='Identify the objects that have not seen an update for a given '
@@ -67,7 +66,7 @@ def main():
     binUtils.prepare_main_logger()
 
     # Parse arguments
-    args = parseArgs()
+    args = parse_args()
     logging.getLogger().setLevel(int(args.log_level))
 
     run(args)

Framework/script/RepoCleaner/qcrepocleaner/o2-qc-repo-move-objects

@@ -1,11 +1,13 @@
 #!/usr/bin/env python3
 
-import logging
 import argparse
+import logging
+import re
+
 import dryable
+
 from qcrepocleaner.Ccdb import Ccdb
 from qcrepocleaner.binUtils import prepare_main_logger
-import re
 
 
 def parse_args():

Framework/script/RepoCleaner/qcrepocleaner/o2-qc-repo-update-run-type

@@ -1,11 +1,13 @@
 #!/usr/bin/env python3
 
-import logging
 import argparse
+import csv
+import logging
+
 import dryable
+
 from qcrepocleaner.Ccdb import Ccdb
 from qcrepocleaner.binUtils import prepare_main_logger
-import csv
 
 
 def parse_args():