From: Martin v. Löwis <martin@v.loewis.de>
Date: Thu, 17 Feb 2005 21:23:42 +0000 (+0000)
Subject: Avoid using items() in environ.update(). Fixes #1124513.
X-Git-Tag: v2.4.1c1~40
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ffcd65532a92dc1db6db95b15802c7d9ffe7a69c;p=thirdparty%2FPython%2Fcpython.git

Avoid using items() in environ.update(). Fixes #1124513.
---

diff --git a/Lib/os.py b/Lib/os.py
index b34e413553e7..514d440b2815 100644
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -438,12 +438,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):
@@ -460,12 +465,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: