PEP8 compliance
This commit is contained in:
parent
58b499f9fe
commit
224ece6be1
6 changed files with 30 additions and 34 deletions
|
@ -2,7 +2,7 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
import logging
|
||||
from flask import request, jsonify, abort
|
||||
from flask import request, abort
|
||||
from app import app
|
||||
from app.services import processor
|
||||
|
||||
|
|
|
@ -23,6 +23,7 @@ from app.controllers import api
|
|||
from app.controllers import mail
|
||||
from app import app
|
||||
|
||||
|
||||
# configure logging
|
||||
def configure_logging(level):
|
||||
root_logger = logging.getLogger()
|
||||
|
@ -30,7 +31,8 @@ def configure_logging(level):
|
|||
ch = logging.StreamHandler()
|
||||
ch.setLevel(level)
|
||||
# create formatter
|
||||
formatter = logging.Formatter('[%(asctime)s] %(name)s %(levelname)s %(message)s')
|
||||
formatter = logging.Formatter(
|
||||
'[%(asctime)s] %(name)s %(levelname)s %(message)s')
|
||||
# add formatter to ch
|
||||
ch.setFormatter(formatter)
|
||||
# add ch to logger
|
||||
|
@ -44,6 +46,10 @@ logger = logging.getLogger(__name__)
|
|||
# initialize database
|
||||
database.setup()
|
||||
|
||||
# routes
|
||||
logger.debug('imported: %s ' % api.__name__)
|
||||
logger.debug('imported: %s ' % mail.__name__)
|
||||
|
||||
# start processor
|
||||
template_path = os.path.abspath(os.path.join(current_path, 'templates'))
|
||||
processor.start(template_path)
|
||||
|
|
|
@ -6,7 +6,6 @@ import re
|
|||
from datetime import datetime
|
||||
from threading import Thread
|
||||
from queue import Queue
|
||||
import chardet
|
||||
from jinja2 import Environment, FileSystemLoader
|
||||
from app.models.site import Site
|
||||
from app.models.comment import Comment
|
||||
|
@ -83,17 +82,18 @@ def new_comment(data):
|
|||
''
|
||||
)
|
||||
comment_text = '\n'.join(comment_list)
|
||||
email_body = get_template('new_comment').render(url=url, comment=comment_text)
|
||||
email_body = get_template('new_comment').render(
|
||||
url=url, comment=comment_text)
|
||||
|
||||
# send email
|
||||
# TODO subject should embed a key
|
||||
subject = '%s: [%d:%s]' % (site.name, comment.id, token)
|
||||
mail(site.admin_email, subject, email_body)
|
||||
|
||||
# TODO support subscription
|
||||
# Reader subscribes to further comments
|
||||
#if subscribe and email:
|
||||
if subscribe and author_email:
|
||||
# TODO support subscription
|
||||
# subscribe_reader(email, article, url)
|
||||
pass
|
||||
|
||||
logger.debug("new comment processed ")
|
||||
|
||||
|
@ -118,8 +118,6 @@ def reply_comment_email(data):
|
|||
logger.warn('ignore corrupted email')
|
||||
return
|
||||
|
||||
# TODO validate chardet decoding is no more needed
|
||||
#message = decode_best_effort(message)
|
||||
if not message:
|
||||
logger.warn('ignore empty email')
|
||||
return
|
||||
|
@ -198,14 +196,6 @@ def notify_reader(email, url):
|
|||
mail(pecosys.get_config('subscription', 'from_email'), email, subject, email_body)
|
||||
|
||||
|
||||
def decode_best_effort(string):
|
||||
info = chardet.detect(string)
|
||||
if info['confidence'] < 0.5:
|
||||
return string.decode('utf8', errors='replace')
|
||||
else:
|
||||
return string.decode(info['encoding'], errors='replace')
|
||||
|
||||
|
||||
def mail(to_email, subject, message):
|
||||
|
||||
headers = {'Content-Type': 'application/json; charset=utf-8'}
|
||||
|
|
Loading…
Add table
Reference in a new issue