Rfactorization. Just a start...

1 files changed, 0 insertions, 109 deletions

diff --git a/pyaggr3g470r/emails.py b/pyaggr3g470r/emails.py
deleted file mode 100644
index 9a129718..00000000
--- a/pyaggr3g470r/emails.py
+++ /dev/null
@@ -1,109 +0,0 @@
-#! /usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# pyAggr3g470r - A Web based news aggregator.
-# Copyright (C) 2010-2015  Cédric Bonhomme - https://www.cedricbonhomme.org
-#
-# For more information : https://bitbucket.org/cedricbonhomme/pyaggr3g470r/
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import logging
-import smtplib
-from email.mime.multipart import MIMEMultipart
-from email.mime.text import MIMEText
-
-from postmark import PMMail
-
-import conf
-from pyaggr3g470r.decorators import async
-
-logger = logging.getLogger(__name__)
-
-
-@async
-def send_async_email(mfrom, mto, msg):
-    try:
-        s = smtplib.SMTP(conf.NOTIFICATION_HOST)
-        s.login(conf.NOTIFICATION_USERNAME, conf.NOTIFICATION_PASSWORD)
-    except Exception:
-        logger.exception('send_async_email raised:')
-    else:
-        s.sendmail(mfrom, mto, msg.as_string())
-        s.quit()
-
-def send(*args, **kwargs):
-    """
-    This functions enables to send email through Postmark
-    or a SMTP server.
-    """
-    if conf.ON_HEROKU:
-        send_postmark(to=kwargs.get("to"),
-                      bcc=kwargs.get("bcc"),
-                      subject=kwargs.get("subject"),
-                      plaintext=kwargs.get("plaintext"))
-    else:
-        send_smtp(to=kwargs.get("to"),
-                   bcc=kwargs.get("bcc"),
-                   subject=kwargs.get("subject"),
-                   plaintext=kwargs.get("plaintext"),
-                   html=kwargs.get("html"))
-
-def send_smtp(to="", bcc="", subject="", plaintext="", html=""):
-    """
-    Send an email.
-    """
-    # Create message container - the correct MIME type is multipart/alternative.
-    msg = MIMEMultipart('alternative')
-    msg['Subject'] = subject
-    msg['From'] = conf.NOTIFICATION_EMAIL
-    msg['To'] = to
-    msg['BCC'] = bcc
-
-    # Record the MIME types of both parts - text/plain and text/html.
-    part1 = MIMEText(plaintext, 'plain', 'utf-8')
-    part2 = MIMEText(html, 'html', 'utf-8')
-
-    # Attach parts into message container.
-    # According to RFC 2046, the last part of a multipart message, in this case
-    # the HTML message, is best and preferred.
-    msg.attach(part1)
-    msg.attach(part2)
-
-    try:
-        s = smtplib.SMTP(conf.NOTIFICATION_HOST)
-        s.login(conf.NOTIFICATION_USERNAME, conf.NOTIFICATION_PASSWORD)
-    except Exception:
-        logger.exception("send_smtp raised:")
-    else:
-        s.sendmail(conf.NOTIFICATION_EMAIL, msg['To'] + ", " + msg['BCC'], msg.as_string())
-        s.quit()
-
-def send_postmark(to="", bcc="", subject="", plaintext=""):
-    """
-    Send an email via Postmark. Used when the application is deployed on
-    Heroku.
-    """
-    try:
-        message = PMMail(api_key = conf.POSTMARK_API_KEY,
-                        subject = subject,
-                        sender = conf.NOTIFICATION_EMAIL,
-                        text_body = plaintext)
-        message.to = to
-        if bcc != "":
-            message.bcc = bcc
-        message.send()
-    except Exception as e:
-        logger.exception("send_postmark raised:")
-        raise e