From aa239e3e5405933af6a29dac3cf587b59a099927 Mon Sep 17 00:00:00 2001 From: Justin Bronn Date: Tue, 5 Aug 2008 17:15:33 +0000 Subject: gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@8215 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/forms/util.py | 1 - 1 file changed, 1 deletion(-) (limited to 'django/forms/util.py') diff --git a/django/forms/util.py b/django/forms/util.py index b3edf41adf..3d80ad219f 100644 --- a/django/forms/util.py +++ b/django/forms/util.py @@ -1,6 +1,5 @@ from django.utils.html import escape from django.utils.encoding import smart_unicode, StrAndUnicode, force_unicode -from django.utils.functional import Promise from django.utils.safestring import mark_safe def flatatt(attrs): -- cgit v1.2.1