p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

In `MergeDict` class, changed variable names to not clash with `dict` builtin. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@6711 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Gary Wilson Jr 2007-11-25 18:07:57 +00:00
parent dab8503146
commit 8df3d2b467
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
django/utils/datastructures.py
View File

@ -7,9 +7,9 @@ class MergeDict(object):
self.dicts = dicts self.dicts = dicts
def __getitem__(self, key): def __getitem__(self, key):
for dict in self.dicts: for dict_ in self.dicts:
try: try:
return dict[key] return dict_[key]
except KeyError: except KeyError:
pass pass
raise KeyError raise KeyError
@ -24,22 +24,22 @@ class MergeDict(object):
return default return default
def getlist(self, key): def getlist(self, key):
for dict in self.dicts: for dict_ in self.dicts:
try: try:
return dict.getlist(key) return dict_.getlist(key)
except KeyError: except KeyError:
pass pass
raise KeyError raise KeyError
def items(self): def items(self):
item_list = [] item_list = []
for dict in self.dicts: for dict_ in self.dicts:
item_list.extend(dict.items()) item_list.extend(dict_.items())
return item_list return item_list
def has_key(self, key): def has_key(self, key):
for dict in self.dicts: for dict_ in self.dicts:
if key in dict: if key in dict_:
return True return True
return False return False
@ -114,8 +114,8 @@ class SortedDict(dict):
for key in self.keyOrder: for key in self.keyOrder:
yield dict.__getitem__(self, key) yield dict.__getitem__(self, key)
def update(self, dict): def update(self, dict_):
for k, v in dict.items(): for k, v in dict_.items():
self.__setitem__(k, v) self.__setitem__(k, v)
def setdefault(self, key, default): def setdefault(self, key, default):