summaryrefslogtreecommitdiff
path: root/django/oldforms/__init__.py
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2007-08-17 15:05:54 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2007-08-17 15:05:54 +0000
commitfcec755f01cfaba2a85bfc9511876debbce98631 (patch)
treee990effbcd90e4d405b0f9dcc70cb38e47b6f3dc /django/oldforms/__init__.py
parent0f92ac52cbf81fb2ac01755c558e2e6ad54700e8 (diff)
newforms-admin: Merged from trunk up to [5916]
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@5918 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/oldforms/__init__.py')
-rw-r--r--django/oldforms/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/oldforms/__init__.py b/django/oldforms/__init__.py
index b3d78f8919..93cfa1d8fa 100644
--- a/django/oldforms/__init__.py
+++ b/django/oldforms/__init__.py
@@ -204,7 +204,7 @@ class FormFieldCollection(FormFieldWrapper):
def __str__(self):
return unicode(self).encode('utf-8')
- def __str__(self):
+ def __unicode__(self):
return unicode(self.formfield_dict)
def __getitem__(self, template_key):