mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Improved a bunch of things.

Browse source 
The constructor now takes an optional dictionary.
Use isinstance() where appropriate.
This commit is contained in:
Guido van Rossum 1999-03-26 15:31:12 +00:00
parent aa3828aa35
commit 1697b9cdf6
1 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Lib/UserDict.py
View file

@ -1,33 +1,36 @@
# A more or less complete user-defined wrapper around dictionary objects # A more or less complete user-defined wrapper around dictionary objects
class UserDict: class UserDict:
def __init__(self): self.data = {} def __init__(self, dict=None):
self.data = {}
if dict is not None: self.update(dict)
def __repr__(self): return repr(self.data) def __repr__(self): return repr(self.data)
def __cmp__(self, dict): def __cmp__(self, dict):
if type(dict) == type(self.data): if isinstance(dict, UserDict):
return cmp(self.data, dict)
else:
return cmp(self.data, dict.data) return cmp(self.data, dict.data)
else:
return cmp(self.data, dict)
def __len__(self): return len(self.data) def __len__(self): return len(self.data)
def __getitem__(self, key): return self.data[key] def __getitem__(self, key): return self.data[key]
def __setitem__(self, key, item): self.data[key] = item def __setitem__(self, key, item): self.data[key] = item
def __delitem__(self, key): del self.data[key] def __delitem__(self, key): del self.data[key]
def clear(self): return self.data.clear() def clear(self): self.data.clear()
def copy(self): def copy(self):
if self.__class__ is UserDict:
return UserDict(self.data)
import copy import copy
return copy.copy(self) return copy.copy(self)
def keys(self): return self.data.keys() def keys(self): return self.data.keys()
def items(self): return self.data.items() def items(self): return self.data.items()
def values(self): return self.data.values() def values(self): return self.data.values()
def has_key(self, key): return self.data.has_key(key) def has_key(self, key): return self.data.has_key(key)
def update(self, other): def update(self, dict):
if type(other) is type(self.data): if isinstance(dict, UserDict):
self.data.update(other) self.data.update(dict.data)
elif isinstance(dict, type(self.data)):
self.data.update(dict)
else: else:
for k, v in other.items(): for k, v in dict.items():
self.data[k] = v self.data[k] = v
def get(self, key, failobj=None): def get(self, key, failobj=None):
if self.data.has_key(key): return self.data.get(key, failobj)
return self.data[key]
else:
return failobj