From 0ced8b0bb211fca38669293b15316930e0d648fd Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Mon, 25 Jun 2007 12:47:19 +0000 Subject: unicode: Merged from trunk up to [5530]. Oracle backend has not been ported to support unicode yet. git-svn-id: http://code.djangoproject.com/svn/django/branches/unicode@5531 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/newforms/widgets.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'django/newforms/widgets.py') diff --git a/django/newforms/widgets.py b/django/newforms/widgets.py index ae17d753bf..50de37074a 100644 --- a/django/newforms/widgets.py +++ b/django/newforms/widgets.py @@ -3,16 +3,15 @@ HTML Widget classes """ try: - set # Only available in Python 2.4+ + set except NameError: - from sets import Set as set # Python 2.3 fallback -from itertools import chain + from sets import Set as set # Python 2.3 fallback +from itertools import chain from django.utils.datastructures import MultiValueDict from django.utils.html import escape from django.utils.translation import ugettext from django.utils.encoding import StrAndUnicode, force_unicode - from util import flatatt __all__ = ( -- cgit v1.3