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
commit8a403845e8d0d77926d795926d74f02c5453a856 (patch)
tree84bf03d633212daaf7d8cddae6887ad8ede50191 /Lib/mailcap.py
parent48221dcb806c98622f5c78c8121af360a53b2c44 (diff)
downloadcpython-8a403845e8d0d77926d795926d74f02c5453a856.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():