[py3] src/python/Databases suports py2 and py3 (#6828)

dmwm · Nov 3, 2021 · 78f22c3 · 78f22c3
1 parent f47285b
commit 78f22c3
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"):