Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
clean:
find . -name '*.pyc' -exec rm -f {} \;
find . -name '*.py~' -exec rm -f {} \;
find . -name '__pycache__' -exec rm -rf {} \;
rm -rf build dist emails.egg-info tmp-emails _files

test:
Expand Down
3 changes: 3 additions & 0 deletions emails/backend/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# encoding: utf-8

from .factory import ObjectFactory
6 changes: 6 additions & 0 deletions emails/backend/dummy.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# encoding: utf-8

class DummyBackend(object):

def sendmail(self, from_addr, to_addrs, msg, mail_options=[], rcpt_options=[]):
pass
File renamed without changes.
2 changes: 2 additions & 0 deletions emails/backend/filebased.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# encoding: utf-8
import django.core.mail.backends.filebased
3 changes: 3 additions & 0 deletions emails/backend/smtp/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# encoding: utf-8

from .backend import SMTPBackend
File renamed without changes.
File renamed without changes.
4 changes: 3 additions & 1 deletion emails/message.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
from .utils import (SafeMIMEText, SafeMIMEMultipart, sanitize_address,
parse_name_and_email, load_email_charsets,
encode_header as encode_header_)
from .smtp import ObjectFactory, SMTPBackend

from .backend import ObjectFactory
from .backend.smtp import SMTPBackend
from .store import MemoryFileStore, BaseFile
from .signers import DKIMSigner

Expand Down
6 changes: 0 additions & 6 deletions emails/smtp/__init__.py

This file was deleted.

1 change: 0 additions & 1 deletion emails/testsuite/conftest.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# encoding: utf-8

import subprocess
import shlex
import time
Expand Down
2 changes: 1 addition & 1 deletion emails/testsuite/smtp/test_factory.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# encoding: utf-8
from __future__ import unicode_literals
import pytest
from emails.smtp.factory import ObjectFactory
from emails.backend.factory import ObjectFactory


def test_object_factory():
Expand Down
2 changes: 1 addition & 1 deletion emails/testsuite/smtp/test_smtp_backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import os
import logging
import emails
from emails.smtp import SMTPBackend
from emails.backend.smtp import SMTPBackend


TRAVIS_CI = os.environ.get('TRAVIS')
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ def find_version(*file_paths):
'emails.compat',
'emails.loader',
'emails.store',
'emails.smtp',
'emails.backend',
'emails.backend.smtp',
'emails.template',
'emails.packages',
'emails.packages.dkim'
Expand Down