Nicer organised imports

6 files changed, 40 insertions, 24 deletions

diff --git a/app/views/__init__.py b/app/views/__init__.py
index ef7c033..58d9fb6 100644
--- a/app/views/__init__.py
+++ b/app/views/__init__.py
@@ -3,6 +3,21 @@ import flask
 
 from .. import app, db
 
+#
+# Some general imports
+#
+from ..login import current_user, login_required
+from ..utils import templated, redirect
+from ..flask_extend import Blueprint
+
+__all__ = [
+    "db", "app",
+    "current_user", "login_required",
+    "templated", "redirect",
+    "Blueprint",
+    "request", "url_for"
+]
+
 # check for mobile visitors
 mobile_checks = ["J2ME", "Opera Mini"]
 
@@ -33,6 +48,7 @@ def format_date(s, format="%Y/%m"):
 def page_not_found (error):
     return render_template("404.jinja", page = request.path), 404
 
+# Now import the views
 from . import categories, consts, expenses, login, api
 
 app.register_blueprint(login.mod)
diff --git a/app/views/api.py b/app/views/api.py
index cce6234..658c0ed 100644
--- a/app/views/api.py
+++ b/app/views/api.py
@@ -1,6 +1,6 @@
 from flask.ext.restless import APIManager
-from .. import app
-from ..model import db, SingleExpense, Category
+from . import app, db
+from ..model import SingleExpense, Category
 
 mods = []
 
diff --git a/app/views/categories.py b/app/views/categories.py
index 1ec7b1d..1857737 100644
--- a/app/views/categories.py
+++ b/app/views/categories.py
@@ -1,9 +1,8 @@
-from ..flask_extend import Blueprint
-from flask import request
+from . import Blueprint, db, \
+        current_user, login_required, \
+        templated, redirect, request
 
-from ..login import current_user, login_required
-from ..utils import templated, redirect
-from ..model import db, Category
+from ..model import Category
 
 mod = Blueprint('categories', __name__)
 
diff --git a/app/views/consts.py b/app/views/consts.py
index 8eef73b..d41e683 100644
--- a/app/views/consts.py
+++ b/app/views/consts.py
@@ -1,14 +1,13 @@
-from ..flask_extend import Blueprint
-from flask import request
+from . import Blueprint, db, \
+        current_user, login_required, \
+        templated, redirect, request
+
+from ..model import Category, ConstExpense
+from ..forms import ConstForm, today
 
 import datetime
 from sqlalchemy import sql
 
-from ..model import db, Category, ConstExpense
-from ..login import current_user, login_required
-from ..forms import ConstForm, today
-from ..utils import templated, redirect
-
 mod = Blueprint('consts', __name__)
 
 def const_form(cur=None, obj=None):
diff --git a/app/views/expenses.py b/app/views/expenses.py
index aa1fd51..8946377 100644
--- a/app/views/expenses.py
+++ b/app/views/expenses.py
@@ -1,14 +1,13 @@
-from ..flask_extend import Blueprint
-from flask import request
+from . import Blueprint, db, \
+        current_user, login_required, \
+        templated, redirect, request
+
+from ..model import Category, SingleExpense, CatExpense, MonthExpense
+from ..forms import ExpenseForm
 
 import datetime, decimal
 from sqlalchemy import sql, func
 
-from ..model import db, Category, SingleExpense, CatExpense, MonthExpense
-from ..login import login_required, current_user
-from ..forms import ExpenseForm
-from ..utils import templated, redirect
-
 mod = Blueprint('expenses', __name__)
 
 def expense_form(obj=None):
diff --git a/app/views/login.py b/app/views/login.py
index 8693c30..4b327ec 100644
--- a/app/views/login.py
+++ b/app/views/login.py
@@ -1,9 +1,12 @@
-from ..flask_extend import Blueprint
-from flask import request, url_for, redirect
+from . import Blueprint, db, \
+        current_user, login_required, \
+        templated, request, url_for
 
 from ..forms import LoginForm
 from ..login import login_user, logout_user, login_manager
-from ..utils import templated
+
+# we explicitly need flask's redirect and not our variant
+from flask import redirect
 
 mod = Blueprint('login', __name__)