messing up

app/__init__.py

@@ -6,7 +6,6 @@ from flask_login import LoginManager
 from flask_wtf.csrf import CSRFProtect, CSRFError
 from flask_babel import Babel, lazy_gettext
 from werkzeug.contrib.fixers import ProxyFix
-from .config import basedir, MAIL_SERVER, MAIL_PORT, MAIL_USERNAME, MAIL_PASSWORD
 
 app = Flask(__name__)
 app.config.from_object('config')
@@ -106,20 +105,20 @@ def get_locale():
 #    g.request_time = lambda: '%.5fs' % (time.time() - g.request_start_time)
 #    g.pjax = 'X-PJAX' in request.headers
 
-if not app.debug and MAIL_SERVER != '':
+if not app.debug and app.config['MAIL_SERVER'] != '':
     import logging
     from logging.handlers import SMTPHandler
     credentials = None
-    secure = None
-    if MAIL_USERNAME or MAIL_PASSWORD:
-        credentials = (MAIL_USERNAME, MAIL_PASSWORD)
-        if MAIL_USE_TLS is None:
+    secure = Nonep
+    if app.config['MAIL_USERNAME'] or app.config['MAIL_PASSWORD']:
+        credentials = (app.config['MAIL_USERNAME'], app.config['MAIL_PASSWORD'])
+        if app.config['MAIL_USE_TLS'] is None:
             secure = ()
     mail_handler = SMTPHandler(
-        mailhost=(MAIL_SERVER, MAIL_PORT),
-        fromaddr=MAIL_SENDER,
-        toaddrs=[MAIL_ADMIN],
-        subject=MAIL_SUBJECT_PREFIX + ' Application Error',
+        mailhost=(app.config['MAIL_SERVER'], app.config['MAIL_PORT']),
+        fromaddr=app.config['MAIL_SENDER'],
+        toaddrs=[app.config['MAIL_ADMIN']],
+        subject=app.config['MAIL_SUBJECT_PREFIX'] + ' Application Error',
         credentials=credentials,
         secure=secure)
     mail_handler.setLevel(logging.ERROR)

app/models.py

@@ -2,10 +2,9 @@ import hashlib
 from werkzeug.security import generate_password_hash, check_password_hash
 from itsdangerous import TimedJSONWebSignatureSerializer as Serializer
 
-from config import Config
 from flask import current_app, request, url_for
 from flask_login import UserMixin, AnonymousUserMixin
-from app.exceptions import ValidationError
+from proxadmin.exceptions import ValidationError
 from . import db, lm
 
 import os

app/vmanager/routes.py

@@ -1,4 +1,3 @@
-from config import Config
 from flask import render_template, abort, redirect, url_for, abort, flash, request, current_app, make_response, g
 from flask_login import login_required, login_user, logout_user, current_user
 from flask_sqlalchemy import get_debug_queries