summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/tools/scripts/wsdiff.py18
1 files changed, 9 insertions, 9 deletions
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 +