From 78f22c3c2d88e255e180f6b5f60f9b4919f8a034 Mon Sep 17 00:00:00 2001 From: Dario Mapelli Date: Wed, 3 Nov 2021 16:15:21 +0100 Subject: [PATCH] [py3] src/python/Databases suports py2 and py3 (#6828) --- obsolete/Databases/FileMetaDataDB/MySQL/Destroy.py | 3 +-- obsolete/Databases/FileTransfersDB/MySQL/Destroy.py | 3 +-- obsolete/Databases/TaskDB/MySQL/Destroy.py | 3 +-- src/python/Databases/FileMetaDataDB/Oracle/Destroy.py | 3 +-- src/python/Databases/FileTransfersDB/Oracle/Destroy.py | 3 +-- src/python/Databases/TaskDB/Oracle/Destroy.py | 3 +-- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/obsolete/Databases/FileMetaDataDB/MySQL/Destroy.py b/obsolete/Databases/FileMetaDataDB/MySQL/Destroy.py index 07975adab4..5149cebe2e 100755 --- a/obsolete/Databases/FileMetaDataDB/MySQL/Destroy.py +++ b/obsolete/Databases/FileMetaDataDB/MySQL/Destroy.py @@ -3,7 +3,6 @@ """ import threading -import string from WMCore.Database.DBCreator import DBCreator from Databases.FileMetaDataDB.Oracle.Create import Create @@ -29,6 +28,6 @@ def __init__(self, logger = None, dbi = None, param=None): i = 0 for tableName in orderedTables: i += 1 - prefix = string.zfill(i, 2) + prefix = str(i).zfill(2) self.create[prefix + tableName] = "DROP TABLE %s" % tableName diff --git a/obsolete/Databases/FileTransfersDB/MySQL/Destroy.py b/obsolete/Databases/FileTransfersDB/MySQL/Destroy.py index 677ec17535..6ecc9c88e4 100755 --- a/obsolete/Databases/FileTransfersDB/MySQL/Destroy.py +++ b/obsolete/Databases/FileTransfersDB/MySQL/Destroy.py @@ -3,7 +3,6 @@ """ import threading -import string from WMCore.Database.DBCreator import DBCreator from Databases.TaskDB.Oracle.Create import Create @@ -29,5 +28,5 @@ def __init__(self, logger = None, dbi = None, param=None): i = 0 for tableName in orderedTables: i += 1 - prefix = string.zfill(i, 2) + prefix = str(i).zfill(2) self.create[prefix + tableName] = "DROP TABLE %s" % tableName diff --git a/obsolete/Databases/TaskDB/MySQL/Destroy.py b/obsolete/Databases/TaskDB/MySQL/Destroy.py index 677ec17535..6ecc9c88e4 100755 --- a/obsolete/Databases/TaskDB/MySQL/Destroy.py +++ b/obsolete/Databases/TaskDB/MySQL/Destroy.py @@ -3,7 +3,6 @@ """ import threading -import string from WMCore.Database.DBCreator import DBCreator from Databases.TaskDB.Oracle.Create import Create @@ -29,5 +28,5 @@ def __init__(self, logger = None, dbi = None, param=None): i = 0 for tableName in orderedTables: i += 1 - prefix = string.zfill(i, 2) + prefix = str(i).zfill(2) self.create[prefix + tableName] = "DROP TABLE %s" % tableName diff --git a/src/python/Databases/FileMetaDataDB/Oracle/Destroy.py b/src/python/Databases/FileMetaDataDB/Oracle/Destroy.py index 07975adab4..5149cebe2e 100755 --- a/src/python/Databases/FileMetaDataDB/Oracle/Destroy.py +++ b/src/python/Databases/FileMetaDataDB/Oracle/Destroy.py @@ -3,7 +3,6 @@ """ import threading -import string from WMCore.Database.DBCreator import DBCreator from Databases.FileMetaDataDB.Oracle.Create import Create @@ -29,6 +28,6 @@ def __init__(self, logger = None, dbi = None, param=None): i = 0 for tableName in orderedTables: i += 1 - prefix = string.zfill(i, 2) + prefix = str(i).zfill(2) self.create[prefix + tableName] = "DROP TABLE %s" % tableName diff --git a/src/python/Databases/FileTransfersDB/Oracle/Destroy.py b/src/python/Databases/FileTransfersDB/Oracle/Destroy.py index 5234436363..217e0bb66c 100755 --- a/src/python/Databases/FileTransfersDB/Oracle/Destroy.py +++ b/src/python/Databases/FileTransfersDB/Oracle/Destroy.py @@ -3,7 +3,6 @@ """ import threading -import string from WMCore.Database.DBCreator import DBCreator from Databases.TaskDB.Oracle.Create import Create @@ -29,7 +28,7 @@ def __init__(self, logger = None, dbi = None, param=None): i = 0 for tableName in orderedTables: i += 1 - prefix = string.zfill(i, 2) + prefix = str(i).zfill(2) if tableName.endswith("_seq"): self.create[prefix + tableName] = "DROP SEQUENCE %s" % tableName elif tableName.endswith("_trg"): diff --git a/src/python/Databases/TaskDB/Oracle/Destroy.py b/src/python/Databases/TaskDB/Oracle/Destroy.py index 5234436363..217e0bb66c 100755 --- a/src/python/Databases/TaskDB/Oracle/Destroy.py +++ b/src/python/Databases/TaskDB/Oracle/Destroy.py @@ -3,7 +3,6 @@ """ import threading -import string from WMCore.Database.DBCreator import DBCreator from Databases.TaskDB.Oracle.Create import Create @@ -29,7 +28,7 @@ def __init__(self, logger = None, dbi = None, param=None): i = 0 for tableName in orderedTables: i += 1 - prefix = string.zfill(i, 2) + prefix = str(i).zfill(2) if tableName.endswith("_seq"): self.create[prefix + tableName] = "DROP SEQUENCE %s" % tableName elif tableName.endswith("_trg"):