pfwb/sendmail: use Django 1.6 atomic() decorator if available revert on commit_on_success() otherwise
This commit is contained in:
parent
b32e66ed14
commit
e26b043fb4
|
@ -11,7 +11,6 @@ import urllib2
|
|||
from django.core.management.base import BaseCommand
|
||||
import django.contrib.auth.models as auth_models
|
||||
from django.core.files.base import ContentFile
|
||||
from django.db import transaction
|
||||
from django.core.exceptions import MultipleObjectsReturned
|
||||
from django.utils.timezone import utc, make_aware
|
||||
from django.template.defaultfilters import slugify
|
||||
|
@ -19,6 +18,10 @@ from django.template.defaultfilters import slugify
|
|||
from docbow_project.docbow import models, timestamp, utils
|
||||
from docbow_project.docbow.email_utils import u2u_decode
|
||||
from django_journal import record
|
||||
try:
|
||||
from django.db.transaction import atomic
|
||||
except ImportError:
|
||||
from django.db.transaction import commit_on_success
|
||||
|
||||
from ... import app_settings
|
||||
|
||||
|
@ -96,7 +99,7 @@ In case of failure the following return value is returned:
|
|||
return None
|
||||
return self.mailing_lists.get(username[len('liste-'):])
|
||||
|
||||
@transaction.commit_on_success
|
||||
@atomic
|
||||
def handle_mail(self, mail, mail_recipients, **options):
|
||||
content_errors = []
|
||||
attachments = []
|
||||
|
|
Loading…
Reference in New Issue