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 = [] diff --git a/docs/releases/1.2.txt b/docs/releases/1.2.txt index a549bd0cce..d66b79f9c5 100644 --- a/docs/releases/1.2.txt +++ b/docs/releases/1.2.txt @@ -286,7 +286,7 @@ connection with which to send e-mail, you can explicitly request an SMTP connection:: from django.core.mail import get_connection - connection = get_connection('django.core.mail.backends.smtp') + connection = get_connection('django.core.mail.backends.smtp.EmailBackend') messages = get_notification_email() connection.send_messages(messages) @@ -294,7 +294,7 @@ If your call to construct an instance of ``SMTPConnection`` required additional arguments, those arguments can be passed to the :meth:`~django.core.mail.get_connection()` call:: - connection = get_connection('django.core.mail.backends.smtp', hostname='localhost', port=1234) + connection = get_connection('django.core.mail.backends.smtp.EmailBackend', hostname='localhost', port=1234) User Messages API ----------------- diff --git a/docs/topics/email.txt b/docs/topics/email.txt index eee77cb4a0..b23b5d328f 100644 --- a/docs/topics/email.txt +++ b/docs/topics/email.txt @@ -408,7 +408,7 @@ settings file. The SMTP backend is the default configuration inherited by Django. If you want to specify it explicitly, put the following in your settings:: - EMAIL_BACKEND = 'django.core.mail.backends.smtp' + EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' .. admonition:: SMTPConnection objects @@ -433,7 +433,7 @@ providing the ``stream`` keyword argument when constructing the connection. To specify this backend, put the following in your settings:: - EMAIL_BACKEND = 'django.core.mail.backends.console' + EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' This backend is not intended for use in production -- it is provided as a convenience that can be used during development. @@ -451,7 +451,7 @@ the ``file_path`` keyword when creating a connection with To specify this backend, put the following in your settings:: - EMAIL_BACKEND = 'django.core.mail.backends.filebased' + EMAIL_BACKEND = 'django.core.mail.backends.filebased.EmailBackend' EMAIL_FILE_PATH = '/tmp/app-messages' # change this to a proper location This backend is not intended for use in production -- it is provided as a @@ -470,7 +470,7 @@ be send. To specify this backend, put the following in your settings:: - EMAIL_BACKEND = 'django.core.mail.backends.locmem' + EMAIL_BACKEND = 'django.core.mail.backends.locmem.EmailBackend' This backend is not intended for use in production -- it is provided as a convenience that can be used during development and testing. @@ -483,7 +483,7 @@ Dummy backend As the name suggests the dummy backend does nothing with your messages. To specify this backend, put the following in your settings:: - EMAIL_BACKEND = 'django.core.mail.backends.dummy' + EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend' This backend is not intended for use in production -- it is provided as a convenience that can be used during development. @@ -495,7 +495,7 @@ Defining a custom e-mail backend If you need to change how e-mails are send you can write your own e-mail backend. The ``EMAIL_BACKEND`` setting in your settings file is then the -Python import path for your backend. +Python import path for your backend class. Custom e-mail backends should subclass ``BaseEmailBackend`` that is located in the ``django.core.mail.backends.base`` module. A custom e-mail backend must @@ -503,7 +503,7 @@ implement the ``send_messages(email_messages)`` method. This method receives a list of :class:`~django.core.mail.EmailMessage` instances and returns the number of successfully delivered messages. If your backend has any concept of a persistent session or connection, you should also implement the ``open()`` -and ``close()`` methods. Refer to ``SMTPEmailBackend`` for a reference +and ``close()`` methods. Refer to ``smtp.EmailBackend`` for a reference implementation. .. _topics-sending-multiple-emails: diff --git a/tests/regressiontests/mail/tests.py b/tests/regressiontests/mail/tests.py index 10d2ae7df3..79aff35694 100644 --- a/tests/regressiontests/mail/tests.py +++ b/tests/regressiontests/mail/tests.py @@ -174,7 +174,7 @@ Content # Test that the console backend can be pointed at an arbitrary stream >>> s = StringIO() ->>> connection = mail.get_connection('django.core.mail.backends.console', stream=s) +>>> connection = mail.get_connection('django.core.mail.backends.console.EmailBackend', stream=s) >>> send_mail('Subject', 'Content', 'from@example.com', ['to@example.com'], connection=connection) 1 >>> print s.getvalue() @@ -270,7 +270,7 @@ Content True # Test custom backend defined in this suite. ->>> conn = mail.get_connection('regressiontests.mail.custombackend') +>>> conn = mail.get_connection('regressiontests.mail.custombackend.EmailBackend') >>> hasattr(conn, 'test_outbox') True >>> email = EmailMessage('Subject', 'Content', 'bounce@example.com', ['to@example.com'], headers={'From': 'from@example.com'}) @@ -280,23 +280,23 @@ True 1 # Test backend argument of mail.get_connection() ->>> isinstance(mail.get_connection('django.core.mail.backends.smtp'), smtp.EmailBackend) +>>> isinstance(mail.get_connection('django.core.mail.backends.smtp.EmailBackend'), smtp.EmailBackend) True ->>> isinstance(mail.get_connection('django.core.mail.backends.locmem'), locmem.EmailBackend) +>>> isinstance(mail.get_connection('django.core.mail.backends.locmem.EmailBackend'), locmem.EmailBackend) True ->>> isinstance(mail.get_connection('django.core.mail.backends.dummy'), dummy.EmailBackend) +>>> isinstance(mail.get_connection('django.core.mail.backends.dummy.EmailBackend'), dummy.EmailBackend) True ->>> isinstance(mail.get_connection('django.core.mail.backends.console'), console.EmailBackend) +>>> isinstance(mail.get_connection('django.core.mail.backends.console.EmailBackend'), console.EmailBackend) True >>> tmp_dir = tempfile.mkdtemp() ->>> isinstance(mail.get_connection('django.core.mail.backends.filebased', file_path=tmp_dir), filebased.EmailBackend) +>>> isinstance(mail.get_connection('django.core.mail.backends.filebased.EmailBackend', file_path=tmp_dir), filebased.EmailBackend) True >>> shutil.rmtree(tmp_dir) >>> isinstance(mail.get_connection(), locmem.EmailBackend) True # Test connection argument of send_mail() et al ->>> connection = mail.get_connection('django.core.mail.backends.console') +>>> connection = mail.get_connection('django.core.mail.backends.console.EmailBackend') >>> send_mail('Subject', 'Content', 'from@example.com', ['to@example.com'], connection=connection) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0