mirror of
https://github.com/python/cpython.git
synced 2025-10-31 21:51:50 +00:00
Move filecmp from using dict.has_key() to dict.__contains__() to silence
warnings triggered under -3.
This commit is contained in:
parent
8161498817
commit
c66b03a4c1
1 changed files with 3 additions and 3 deletions
|
|
@ -132,9 +132,9 @@ def phase0(self): # Compare everything except common subdirectories
|
|||
def phase1(self): # Compute common names
|
||||
a = dict(izip(imap(os.path.normcase, self.left_list), self.left_list))
|
||||
b = dict(izip(imap(os.path.normcase, self.right_list), self.right_list))
|
||||
self.common = map(a.__getitem__, ifilter(b.has_key, a))
|
||||
self.left_only = map(a.__getitem__, ifilterfalse(b.has_key, a))
|
||||
self.right_only = map(b.__getitem__, ifilterfalse(a.has_key, b))
|
||||
self.common = map(a.__getitem__, ifilter(b.__contains__, a))
|
||||
self.left_only = map(a.__getitem__, ifilterfalse(b.__contains__, a))
|
||||
self.right_only = map(b.__getitem__, ifilterfalse(a.__contains__, b))
|
||||
|
||||
def phase2(self): # Distinguish files, directories, funnies
|
||||
self.common_dirs = []
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue