From b80def786494f6dac407ffb654e0c6c3b20cab23 Mon Sep 17 00:00:00 2001
From: Sergey Lavrinenko <s@lavr.me>
Date: Sun, 1 Mar 2015 03:56:48 +0300
Subject: [PATCH] emails.backend restructured

---
 Makefile                                   | 1 +
 emails/backend/__init__.py                 | 3 +++
 emails/backend/dummy.py                    | 6 ++++++
 emails/{smtp => backend}/factory.py        | 0
 emails/backend/filebased.py                | 2 ++
 emails/backend/smtp/__init__.py            | 3 +++
 emails/{ => backend}/smtp/backend.py       | 0
 emails/{ => backend}/smtp/client.py        | 0
 emails/message.py                          | 4 +++-
 emails/smtp/__init__.py                    | 6 ------
 emails/testsuite/conftest.py               | 1 -
 emails/testsuite/smtp/test_factory.py      | 2 +-
 emails/testsuite/smtp/test_smtp_backend.py | 2 +-
 setup.py                                   | 3 ++-
 14 files changed, 22 insertions(+), 11 deletions(-)
 create mode 100644 emails/backend/__init__.py
 create mode 100644 emails/backend/dummy.py
 rename emails/{smtp => backend}/factory.py (100%)
 create mode 100644 emails/backend/filebased.py
 create mode 100644 emails/backend/smtp/__init__.py
 rename emails/{ => backend}/smtp/backend.py (100%)
 rename emails/{ => backend}/smtp/client.py (100%)
 delete mode 100644 emails/smtp/__init__.py

diff --git a/Makefile b/Makefile
index fe9ff6c..df7f8d0 100644
--- a/Makefile
+++ b/Makefile
@@ -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:
diff --git a/emails/backend/__init__.py b/emails/backend/__init__.py
new file mode 100644
index 0000000..a1d4c63
--- /dev/null
+++ b/emails/backend/__init__.py
@@ -0,0 +1,3 @@
+# encoding: utf-8
+
+from .factory import ObjectFactory
diff --git a/emails/backend/dummy.py b/emails/backend/dummy.py
new file mode 100644
index 0000000..b1474dc
--- /dev/null
+++ b/emails/backend/dummy.py
@@ -0,0 +1,6 @@
+# encoding: utf-8
+
+class DummyBackend(object):
+
+    def sendmail(self, from_addr, to_addrs, msg, mail_options=[], rcpt_options=[]):
+        pass
\ No newline at end of file
diff --git a/emails/smtp/factory.py b/emails/backend/factory.py
similarity index 100%
rename from emails/smtp/factory.py
rename to emails/backend/factory.py
diff --git a/emails/backend/filebased.py b/emails/backend/filebased.py
new file mode 100644
index 0000000..3246a1a
--- /dev/null
+++ b/emails/backend/filebased.py
@@ -0,0 +1,2 @@
+# encoding: utf-8
+import django.core.mail.backends.filebased
\ No newline at end of file
diff --git a/emails/backend/smtp/__init__.py b/emails/backend/smtp/__init__.py
new file mode 100644
index 0000000..5269652
--- /dev/null
+++ b/emails/backend/smtp/__init__.py
@@ -0,0 +1,3 @@
+# encoding: utf-8
+
+from .backend import SMTPBackend
\ No newline at end of file
diff --git a/emails/smtp/backend.py b/emails/backend/smtp/backend.py
similarity index 100%
rename from emails/smtp/backend.py
rename to emails/backend/smtp/backend.py
diff --git a/emails/smtp/client.py b/emails/backend/smtp/client.py
similarity index 100%
rename from emails/smtp/client.py
rename to emails/backend/smtp/client.py
diff --git a/emails/message.py b/emails/message.py
index 4150462..331b9e4 100644
--- a/emails/message.py
+++ b/emails/message.py
@@ -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
 
diff --git a/emails/smtp/__init__.py b/emails/smtp/__init__.py
deleted file mode 100644
index e801caf..0000000
--- a/emails/smtp/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# encoding: utf-8
-__author__ = 'lavrinenko'
-
-from .factory import ObjectFactory
-from .client import SMTPResponse
-from .backend import SMTPBackend
diff --git a/emails/testsuite/conftest.py b/emails/testsuite/conftest.py
index 3801e61..609e644 100644
--- a/emails/testsuite/conftest.py
+++ b/emails/testsuite/conftest.py
@@ -1,5 +1,4 @@
 # encoding: utf-8
-
 import subprocess
 import shlex
 import time
diff --git a/emails/testsuite/smtp/test_factory.py b/emails/testsuite/smtp/test_factory.py
index 5f3fe12..da47db3 100644
--- a/emails/testsuite/smtp/test_factory.py
+++ b/emails/testsuite/smtp/test_factory.py
@@ -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():
diff --git a/emails/testsuite/smtp/test_smtp_backend.py b/emails/testsuite/smtp/test_smtp_backend.py
index 7f0f7b9..b658a52 100644
--- a/emails/testsuite/smtp/test_smtp_backend.py
+++ b/emails/testsuite/smtp/test_smtp_backend.py
@@ -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')
diff --git a/setup.py b/setup.py
index a3156c5..35794d1 100644
--- a/setup.py
+++ b/setup.py
@@ -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'