diff --git a/flask_website/openid_auth.py b/flask_website/openid_auth.py index 9895a9a9..47a3a0df 100644 --- a/flask_website/openid_auth.py +++ b/flask_website/openid_auth.py @@ -1,8 +1,5 @@ -from __future__ import with_statement - from time import time from hashlib import sha1 -from contextlib import closing from openid.association import Association from openid.store.interface import OpenIDStore @@ -10,8 +7,10 @@ from openid.consumer.consumer import Consumer, SUCCESS, CANCEL from openid.consumer import discover from openid.store import nonce -from sqlalchemy.orm import scoped_session -from sqlalchemy.exceptions import SQLError +# python-openid is a really stupid library in that regard, we have +# to disable logging by monkey patching +from openid import oidutil +oidutil.log = lambda *a, **kw: None from flask import request, redirect, abort, url_for, flash, session from flask_website.database import User, db_session, OpenIDAssociation, \ diff --git a/sync-librelist.py b/sync-librelist.py index 606a4729..0f8b9dab 100644 --- a/sync-librelist.py +++ b/sync-librelist.py @@ -23,13 +23,8 @@ from subprocess import Popen from flask import json from werkzeug import Headers, parse_date - - -INCOMING_MAIL_FOLDER = '_mailinglist/incoming' -THREAD_FOLDER = '_mailinglist/threads' -LIST_NAME = 'flask' -RSYNC_PATH = 'librelist.com::json/%s' -SUBJECT_PREFIX = '[flask]' +from websiteconfig import INCOMING_MAIL_FOLDER, THREAD_FOLDER, \ + LIST_NAME, RSYNC_PATH, SUBJECT_PREFIX _punctuation_re = re.compile(r'[\t !"#$%&\'()*\-/<=>?@\[\\\]^_`{|},.:]+') diff --git a/websiteconfig.py b/websiteconfig.py index 7e7f7021..37ee8ad7 100644 --- a/websiteconfig.py +++ b/websiteconfig.py @@ -3,9 +3,16 @@ import os _basedir = os.path.abspath(os.path.dirname(__file__)) DEBUG = False + SECRET_KEY = 'testkey' DATABASE_URI = 'sqlite:///' + os.path.join(_basedir, 'flask-website.db') -MAILINGLIST_PATH = os.path.join(_basedir, '_mailinglist') + THREADS_PER_PAGE = 15 +MAILINGLIST_PATH = os.path.join(_basedir, '_mailinglist') +INCOMING_MAIL_FOLDER = '_mailinglist/incoming' +THREAD_FOLDER = '_mailinglist/threads' +LIST_NAME = 'flask' +RSYNC_PATH = 'librelist.com::json/%s' +SUBJECT_PREFIX = '[flask]' del os