diff options
Diffstat (limited to 'django')
| -rw-r--r-- | django/conf/global_settings.py | 2 | ||||
| -rw-r--r-- | django/core/mail/__init__.py | 13 | ||||
| -rw-r--r-- | django/test/utils.py | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index e3ba6602cc..0cc591daa5 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -143,7 +143,7 @@ DATABASES = { # The default is to use the SMTP backend. # Third-party backends can be specified by providing a Python path # to a module that defines an EmailBackend class. -EMAIL_BACKEND = 'django.core.mail.backends.smtp' +EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' # Host for sending e-mail. EMAIL_HOST = 'localhost' diff --git a/django/core/mail/__init__.py b/django/core/mail/__init__.py index 9a629035cf..f9d1210791 100644 --- a/django/core/mail/__init__.py +++ b/django/core/mail/__init__.py @@ -28,16 +28,17 @@ def get_connection(backend=None, fail_silently=False, **kwds): """ path = backend or settings.EMAIL_BACKEND try: - mod = import_module(path) + mod_name, klass_name = path.rsplit('.', 1) + mod = import_module(mod_name) except ImportError, e: - raise ImproperlyConfigured(('Error importing email backend %s: "%s"' - % (path, e))) + raise ImproperlyConfigured(('Error importing email backend module %s: "%s"' + % (mod_name, e))) try: - cls = getattr(mod, 'EmailBackend') + klass = getattr(mod, klass_name) except AttributeError: raise ImproperlyConfigured(('Module "%s" does not define a ' - '"EmailBackend" class' % path)) - return cls(fail_silently=fail_silently, **kwds) + '"%s" class' % (mod_name, klass_name))) + return klass(fail_silently=fail_silently, **kwds) def send_mail(subject, message, from_email, recipient_list, diff --git a/django/test/utils.py b/django/test/utils.py index 5990e9d07f..1129976e4e 100644 --- a/django/test/utils.py +++ b/django/test/utils.py @@ -43,7 +43,7 @@ def setup_test_environment(): mail.SMTPConnection = locmem.EmailBackend mail.original_email_backend = settings.EMAIL_BACKEND - settings.EMAIL_BACKEND = 'django.core.mail.backends.locmem' + settings.EMAIL_BACKEND = 'django.core.mail.backends.locmem.EmailBackend' mail.outbox = [] |