diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2005-02-17 21:23:20 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2005-02-17 21:23:20 (GMT) |
| commit | 5510f65f5a033eb8d0e9d90046087047410846f9 (patch) | |
| tree | a4c660c83698b3404579c565f1072c3b5bbd5191 | |
| parent | 3040b199768dbf1fc93ecb95dbd27ef9485fa03d (diff) | |
| download | cpython-5510f65f5a033eb8d0e9d90046087047410846f9.zip cpython-5510f65f5a033eb8d0e9d90046087047410846f9.tar.gz cpython-5510f65f5a033eb8d0e9d90046087047410846f9.tar.bz2 | |
Avoid using items() in environ.update(). Fixes #1124513.
Will backport to 2.4.
| -rw-r--r-- | Lib/os.py | 26 | ||||
| -rw-r--r-- | Lib/test/test_os.py | 2 |
2 files changed, 19 insertions, 9 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: diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py index cce6926..2bc5fc0 100644 --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -227,7 +227,7 @@ class EnvironTests(mapping_tests.BasicTestMappingProtocol): os.environ.update(self.__save) # Bug 1110478 - def test_update(self): + def test_update2(self): if os.path.exists("/bin/sh"): os.environ.update(HELLO="World") value = os.popen("/bin/sh -c 'echo $HELLO'").read().strip() |