Merge origin/master

[philo.git] / admin / widgets.py

diff --git a/admin/widgets.py b/admin/widgets.py
index f53c5b7..f8799fe 100644 (file)
--- a/admin/widgets.py
+++ b/admin/widgets.py
@@ -1,9 +1,9 @@
 from django import forms
 from django.conf import settings
 from django.utils.translation import ugettext as _
 from django import forms
 from django.conf import settings
 from django.utils.translation import ugettext as _

-from django.utils.html import escape
-from django.utils.text import truncate_words

 from django.utils.safestring import mark_safe
 from django.utils.safestring import mark_safe

+from django.utils.text import truncate_words
+from django.utils.html import escape

 
 
 class ModelLookupWidget(forms.TextInput):
 
 
 class ModelLookupWidget(forms.TextInput):