--- a/src/catedit/__init__.py Tue Dec 16 11:14:55 2014 +0100
+++ b/src/catedit/__init__.py Wed Dec 17 17:21:06 2014 +0100
@@ -1,15 +1,19 @@
+"""
+__init__.py:
+module main file used to configure the Flask app
+"""
from flask import Flask, session
from flask.ext.github import GitHub
from flask.ext.cache import Cache
-from settings import *
-from config import *
-from logging import *
+from settings import AppSettings
+from config import AppConfig
+from logging import FileHandler, Formatter
# set up app and database
app = Flask(__name__)
-app.config.from_object(appSettings)
+app.config.from_object(AppSettings)
cache = Cache(app, config={"CACHE_TYPE": "simple"})
-app.config.from_object(appConfig)
+app.config.from_object(AppConfig)
github = GitHub(app)