From: Martin v. Löwis <martin@v.loewis.de>
Date: Sat, 29 Jan 2005 13:33:27 +0000 (+0000)
Subject: Revert os.py 1.75, and directly implement update.
X-Git-Tag: v2.4.1c1~62
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e6b1cc81456c966812b06d8dd1e2e61ed24cc46a;p=thirdparty%2FPython%2Fcpython.git

Revert os.py 1.75, and directly implement update.
Fixes #1110478 and #1100235.
---

diff --git a/Lib/os.py b/Lib/os.py
index 65b1830f8b9a..b34e413553e7 100644
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -435,6 +435,17 @@ else:
                 return key.upper() in self.data
             def get(self, key, failobj=None):
                 return self.data.get(key.upper(), failobj)
+            def update(self, dict=None, **kwargs):
+                if dict:
+                    try:
+                        items = dict.items()
+                    except AttributeError:
+                        # List of (key, value)
+                        items = dict
+                    for k, v in items:
+                        self[k] = v
+                if kwargs:
+                    self.update(kwargs)
             def copy(self):
                 return dict(self)
 
@@ -446,6 +457,17 @@ else:
             def __setitem__(self, key, item):
                 putenv(key, item)
                 self.data[key] = item
+            def update(self,  dict=None, **kwargs):
+                if dict:
+                    try:
+                        items = dict.items()
+                    except AttributeError:
+                        # List of (key, value)
+                        items = dict
+                    for k, v in items:
+                        self[k] = v
+                if kwargs:
+                    self.update(kwargs)
             try:
                 unsetenv
             except NameError:
diff --git a/Misc/NEWS b/Misc/NEWS
index 08d905732439..33fd6366d40a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -25,6 +25,8 @@ Core and builtins
 Library
 -------
 
+- Bug #1110478: Revert os.environ.update to do putenv again.
+
 - Bug #1103844: fix distutils.install.dump_dirs() with negated options.
 
 - Bug #1067732: wininst --install-script doesn't leave residual files anymore.