Commits

Mathijs de Bruin committed 71bb733 Merge

Merge pull request #49 from torhve/master

Change admin imports for Django 1.5.

  • Participants
  • Parent commits 955dcdb, 030a8b2

Comments (0)

Files changed (1)

File newsletter/admin_utils.py

 from django.utils.functional import update_wrapper
 from django.utils.translation import ugettext_lazy as _
 
-from django.contrib.admin.util import unquote, force_unicode
+from django.contrib.admin.util import unquote
+from django.utils.encoding import force_unicode
 
 
 class ExtendibleModelAdminMixin(object):