From a2e1144ad94de08080f8d22a0e22ef8fa80633a4 Mon Sep 17 00:00:00 2001 From: Andy Fiddaman Date: Wed, 24 Nov 2021 15:33:46 +0000 Subject: 14263 wsdiff: replace some deprecated python methods Reviewed by: Rich Lowe Reviewed by: Jason King Reviewed by: Sebastian Wiedenroth Approved by: Dan McDonald --- usr/src/tools/scripts/wsdiff.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'usr/src/tools/scripts/wsdiff.py') diff --git a/usr/src/tools/scripts/wsdiff.py b/usr/src/tools/scripts/wsdiff.py index b5e2856022..ee76209bba 100644 --- a/usr/src/tools/scripts/wsdiff.py +++ b/usr/src/tools/scripts/wsdiff.py @@ -822,9 +822,9 @@ diff_ctf.genunix2 = None def diff_elf_section(f1, f2, section, sh_type) : - t = threading.currentThread() - tmpFile1 = tmpDir1 + os.path.basename(f1) + t.getName() - tmpFile2 = tmpDir2 + os.path.basename(f2) + t.getName() + t = threading.current_thread() + tmpFile1 = tmpDir1 + os.path.basename(f1) + t.name + tmpFile2 = tmpDir2 + os.path.basename(f2) + t.name if (sh_type == "SHT_RELA") : # sh_type == SHT_RELA cmd1 = elfdump_cmd + " -r " + f1 + " > " + tmpFile1 @@ -1063,9 +1063,9 @@ def clearTmpDirs(dir1, dir2) : def compareArchives(base, ptch, fileType) : fileName = fnFormat(base) - t = threading.currentThread() - ArchTmpDir1 = tmpDir1 + os.path.basename(base) + t.getName() - ArchTmpDir2 = tmpDir2 + os.path.basename(base) + t.getName() + t = threading.current_thread() + ArchTmpDir1 = tmpDir1 + os.path.basename(base) + t.name + ArchTmpDir2 = tmpDir2 + os.path.basename(base) + t.name # # Be optimistic and first try a straight file compare @@ -1205,9 +1205,9 @@ def compareBasic(base, ptch, quiet, fileType) : def compareByDumping(base, ptch, quiet, fileType) : fileName = fnFormat(base); - t = threading.currentThread() - tmpFile1 = tmpDir1 + os.path.basename(base) + t.getName() - tmpFile2 = tmpDir2 + os.path.basename(ptch) + t.getName() + t = threading.current_thread() + tmpFile1 = tmpDir1 + os.path.basename(base) + t.name + tmpFile2 = tmpDir2 + os.path.basename(ptch) + t.name if fileType == "Lint Library" : baseCmd = (lintdump_cmd + " -ir " + base + -- cgit v1.2.3