diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2007-02-25 20:01:08 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2007-02-25 20:01:08 +0000 |
| commit | 8a70334640b31229d53e982bd59d951fe15aecbc (patch) | |
| tree | 793c50ad4f6fea8de6507672aa123adade5f3abf /django/utils/datastructures.py | |
| parent | 43829a95d3e5740250794a0b4400fd813e724a2e (diff) | |
newforms-admin: Merged to [4579]
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@4580 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/utils/datastructures.py')
| -rw-r--r-- | django/utils/datastructures.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/utils/datastructures.py b/django/utils/datastructures.py index 9bec7a5df7..c20da05144 100644 --- a/django/utils/datastructures.py +++ b/django/utils/datastructures.py @@ -17,7 +17,7 @@ class MergeDict(object): def __contains__(self, key): return self.has_key(key) - def get(self, key, default): + def get(self, key, default=None): try: return self[key] except KeyError: |