summaryrefslogtreecommitdiff
path: root/Lib/mailcap.py
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2002-06-02 18:55:56 +0000
committerRaymond Hettinger <python@rcn.com>2002-06-02 18:55:56 +0000
commite0d4972acc8cfd4b8fb16c074a8031e50fab0f29 (patch)
treeb9a9286453c2ee4397618d4483679c3bc531f4b0 /Lib/mailcap.py
parent1fab9ee085755ed2f7abcf28794d7c20bd51a97a (diff)
downloadcpython-git-e0d4972acc8cfd4b8fb16c074a8031e50fab0f29.tar.gz
Replaced .keys() with dictionary iterators
Diffstat (limited to 'Lib/mailcap.py')
-rw-r--r--Lib/mailcap.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/mailcap.py b/Lib/mailcap.py
index b8ed7597f2..b2ddacd046 100644
--- a/Lib/mailcap.py
+++ b/Lib/mailcap.py
@@ -24,11 +24,11 @@ def getcaps():
continue
morecaps = readmailcapfile(fp)
fp.close()
- for key in morecaps.keys():
+ for key, value in morecaps.iteritems():
if not key in caps:
- caps[key] = morecaps[key]
+ caps[key] = value
else:
- caps[key] = caps[key] + morecaps[key]
+ caps[key] = caps[key] + value
return caps
def listmailcapfiles():