diff options
author | Brett Cannon <bcannon@gmail.com> | 2008-08-04 21:23:07 +0000 |
---|---|---|
committer | Brett Cannon <bcannon@gmail.com> | 2008-08-04 21:23:07 +0000 |
commit | 70c680be1e90c452cc7fcf96ae907bf4d86acaae (patch) | |
tree | 08e418400df560061fd5a33efb627d942e19ac41 /Lib/tarfile.py | |
parent | 5dc6a0b0954fecfb6f6464c548440a587d2fc1fc (diff) | |
download | cpython-70c680be1e90c452cc7fcf96ae907bf4d86acaae.tar.gz |
Remove a dict.has_key() and list.sort(cmp=) usage from tarfile to silence
warnings under -3.
Diffstat (limited to 'Lib/tarfile.py')
-rw-r--r-- | Lib/tarfile.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/tarfile.py b/Lib/tarfile.py index 85abcd8d85..ab74cc5925 100644 --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -51,6 +51,7 @@ import time import struct import copy import re +import operator if sys.platform == 'mac': # This module needs work for MacOS9, especially in the area of pathname @@ -1401,7 +1402,7 @@ class TarInfo(object): next._apply_pax_info(pax_headers, tarfile.encoding, tarfile.errors) next.offset = self.offset - if pax_headers.has_key("size"): + if "size" in pax_headers: # If the extended header replaces the size field, # we need to recalculate the offset where the next # header starts. @@ -2027,7 +2028,7 @@ class TarFile(object): self.extract(tarinfo, path) # Reverse sort directories. - directories.sort(lambda a, b: cmp(a.name, b.name)) + directories.sort(key=operator.attrgetter('name')) directories.reverse() # Set correct owner, mtime and filemode on directories. |