Author: leidel
Date: Thu Feb 5 08:34:21 2009
New Revision: 62
Modified:
trunk/mailer/__init__.py
Log:
Remove import wrapper for force_unicode introduced in r61
Modified: trunk/mailer/__init__.py
==============================================================================
--- trunk/mailer/__init__.py (original)
+++ trunk/mailer/__init__.py Thu Feb 5 08:34:21 2009
@@ -15,18 +15,14 @@
"deferred": "4",
}
-def force_unicode_wrapper(text):
- """wraps force_unicode to prevent ImportError during installation"""
- from django.utils.encoding import force_unicode
- return force_unicode(text)
-
# replacement for django.core.mail.send_mail
def send_mail(subject, message, from_email, recipient_list,
priority="medium",
fail_silently=False, auth_user=None, auth_password=None):
+ from django.utils.encoding import force_unicode
from mailer.models import Message
# need to do this in case subject used lazy version of ugettext
- subject = force_unicode_wrapper(subject)
+ subject = force_unicode(subject)
priority = PRIORITY_MAPPING[priority]
for to_address in recipient_list:
Message(to_address=to_address,
@@ -36,23 +32,25 @@
priority=priority).save()
def mail_admins(subject, message, fail_silently=False, priority="medium"):
+ from django.utils.encoding import force_unicode
from django.conf import settings
from mailer.models import Message
priority = PRIORITY_MAPPING[priority]
for name, to_address in settings.ADMINS:
Message(to_address=to_address,
from_address=settings.SERVER_EMAIL,
- subject=settings.EMAIL_SUBJECT_PREFIX +
force_unicode_wrapper(subject),
+ subject=settings.EMAIL_SUBJECT_PREFIX +
force_unicode(subject),
message_body=message,
priority=priority).save()
def mail_managers(subject, message, fail_silently=False,
priority="medium"):
+ from django.utils.encoding import force_unicode
from django.conf import settings
from mailer.models import Message
priority = PRIORITY_MAPPING[priority]
for name, to_address in settings.MANAGERS:
Message(to_address=to_address,
from_address=settings.SERVER_EMAIL,
- subject=settings.EMAIL_SUBJECT_PREFIX +
force_unicode_wrapper(subject),
+ subject=settings.EMAIL_SUBJECT_PREFIX +
force_unicode(subject),
message_body=message,
priority=priority).save()
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"pinax-updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/pinax-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
