mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-22 17:16:24 +00:00
Code Issues 25 Releases Wiki Activity

Added more readable __str__ and __repr__ methods to MergeDict.

Browse Source 
Thanks, john@calixto.net. Fixed #3508.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13721 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2010-09-10 19:24:24 +00:00
parent dee7ef802d
commit 255147c97e
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -238,6 +238,7 @@ answer newbie questions, and generally made Django that much better:
jcrasta@gmail.com jcrasta@gmail.com
jdetaeye jdetaeye
jhenry <jhenry@theonion.com> jhenry <jhenry@theonion.com>
john@calixto.net
Zak Johnson <zakj@nox.cx> Zak Johnson <zakj@nox.cx>
Nis Jørgensen <nis@superlativ.dk> Nis Jørgensen <nis@superlativ.dk>
Michael Josephson <http://www.sdjournal.com/> Michael Josephson <http://www.sdjournal.com/>

21
django/utils/datastructures.py
View File

@ -77,6 +77,27 @@ class MergeDict(object):
"""Returns a copy of this object.""" """Returns a copy of this object."""
return self.__copy__() return self.__copy__()
def __str__(self):
'''
Returns something like
"{'key1': 'val1', 'key2': 'val2', 'key3': 'val3'}"
instead of the generic "<object meta-data>" inherited from object.
'''
return str(dict(self.items()))
def __repr__(self):
'''
Returns something like
MergeDict({'key1': 'val1', 'key2': 'val2'}, {'key3': 'val3'})
instead of generic "<object meta-data>" inherited from object.
'''
dictreprs = ', '.join(repr(d) for d in self.dicts)
return '%s(%s)' % (self.__class__.__name__, dictreprs)
class SortedDict(dict): class SortedDict(dict):
""" """
A dictionary that keeps its keys in the order in which they're inserted. A dictionary that keeps its keys in the order in which they're inserted.