mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Revert os.py 1.75, and directly implement update.

Browse source 
Fixes #1110478 and #1100235.
This commit is contained in:
Martin v. Löwis 2005-01-29 13:29:23 +00:00
parent 3069dbb8ec
commit 1d11de6dbd
3 changed files with 31 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Lib/os.py
View file

@ -442,6 +442,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)
@ -453,6 +464,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: