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

Fix bug in copy() by using copy.copy() instead of making assumptions

Browse source 
(it so happens that copy.copy() works fine for the base UserDict
type).  Also reindented the entire module to have 4-space indents.
This commit is contained in:
Guido van Rossum 1997-06-03 14:10:01 +00:00
parent bd40d7e69f
commit b94cd96977
1 changed files with 25 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

56
Lib/UserDict.py
View file

@ -1,34 +1,28 @@
# 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): self.data = {}
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 type(dict) == type(self.data):
return cmp(self.data, dict) return cmp(self.data, dict)
else: else:
return cmp(self.data, dict.data) return cmp(self.data, dict.data)
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): return self.data.clear()
def copy(self): def copy(self):
if self.__class__ is UserDict: import copy
new = UserDict() return copy.copy(self)
new.dict = self.data.copy() def keys(self): return self.data.keys()
else: def items(self): return self.data.items()
new = self.__class__() # XXX assumption: constructor signature def values(self): return self.data.values()
for k, v in self.items(): def has_key(self, key): return self.data.has_key(key)
new[k] = v def update(self, other):
return new if type(other) is type(self.data):
def keys(self): return self.data.keys() self.data.update(other)
def items(self): return self.data.items() else:
def values(self): return self.data.values() for k, v in other.items():
def has_key(self, key): return self.data.has_key(key) self.data[k] = v
def update(self, other):
if type(other) is type(self.data):
self.data.update(other)
else:
for k, v in other.items():
self.data[k] = v