diff options
author | Martin v. Löwis <martin@v.loewis.de> | 2005-02-17 21:23:20 +0000 |
---|---|---|
committer | Martin v. Löwis <martin@v.loewis.de> | 2005-02-17 21:23:20 +0000 |
commit | 165f26c301dd7e23fcef56cc61ed49ee7d319387 (patch) | |
tree | cfbc170e07ffc45b1c594c9d3ba725f95150c83a /Lib/os.py | |
parent | 8b44fb78c1cfdbdd88c4130234d2f7117429f9ae (diff) | |
download | cpython-165f26c301dd7e23fcef56cc61ed49ee7d319387.tar.gz |
Avoid using items() in environ.update(). Fixes #1124513.
Will backport to 2.4.
Diffstat (limited to 'Lib/os.py')
-rw-r--r-- | Lib/os.py | 26 |
1 files changed, 18 insertions, 8 deletions
@@ -445,12 +445,17 @@ else: def update(self, dict=None, **kwargs): if dict: try: - items = dict.items() + keys = dict.keys() except AttributeError: # List of (key, value) - items = dict - for k, v in items: - self[k] = v + for k, v in dict: + self[k] = v + else: + # got keys + # cannot use items(), since mappings + # may not have them. + for k in keys: + self[k] = dict[k] if kwargs: self.update(kwargs) def copy(self): @@ -467,12 +472,17 @@ else: def update(self, dict=None, **kwargs): if dict: try: - items = dict.items() + keys = dict.keys() except AttributeError: # List of (key, value) - items = dict - for k, v in items: - self[k] = v + for k, v in dict: + self[k] = v + else: + # got keys + # cannot use items(), since mappings + # may not have them. + for k in keys: + self[k] = dict[k] if kwargs: self.update(kwargs) try: |