summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené 'Necoro' Neumann <necoro@necoro.net>2013-11-01 17:41:53 +0100
committerRené 'Necoro' Neumann <necoro@necoro.net>2013-11-01 17:41:53 +0100
commitec69bf1dc3be9eb2ebf971943539d77fb70f83c6 (patch)
tree1348004b579c6729194b9b3bd33beaccd8130269
parentb36ec721ab97b80b1d070426c6f3f09b62ac5c7e (diff)
downloadkosten-ec69bf1dc3be9eb2ebf971943539d77fb70f83c6.tar.gz
kosten-ec69bf1dc3be9eb2ebf971943539d77fb70f83c6.tar.bz2
kosten-ec69bf1dc3be9eb2ebf971943539d77fb70f83c6.zip
Remove 'flask_extend' -- we are on 0.10 already
-rw-r--r--app/__init__.py2
-rw-r--r--app/flask_extend.py32
-rw-r--r--app/views/__init__.py3
3 files changed, 2 insertions, 35 deletions
diff --git a/app/__init__.py b/app/__init__.py
index c1e64af..9a76b6d 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -1,4 +1,4 @@
-from .flask_extend import Flask
+from flask import Flask
# create app
app = Flask('kosten')
diff --git a/app/flask_extend.py b/app/flask_extend.py
deleted file mode 100644
index 5096d17..0000000
--- a/app/flask_extend.py
+++ /dev/null
@@ -1,32 +0,0 @@
-from flask import Flask as _Flask
-from flask import Blueprint as _Blueprint
-
-if not hasattr(_Flask, 'template_test'):
-# model `template_test` -- introduced with flask-0.10
- class Flask(_Flask):
- def template_test(self, name=None):
- def decorator(f):
- self.add_template_test(f, name=name)
- return f
- return decorator
-
- def add_template_test(self, f, name=None):
- self.jinja_env.tests[name or f.__name__] = f
-
- class Blueprint(_Blueprint):
- def app_template_test(self, name=None):
- def decorator(f):
- self.add_app_template_test(f, name=name)
- return f
- return decorator
-
- def add_app_template_test(self, f, name=None):
- def register_template(state):
- state.app.jinja_env.tests[name or f.__name__] = f
- self.record_once(register_template)
-
-else:
- Flask = _Flask
- Blueprint = _Blueprint
-
-del _Flask, _Blueprint
diff --git a/app/views/__init__.py b/app/views/__init__.py
index 7e0a6a4..b8ae6b3 100644
--- a/app/views/__init__.py
+++ b/app/views/__init__.py
@@ -8,8 +8,7 @@ from .. import app, db
#
from ..login import current_user, login_required
from ..utils import today, templated, redirect, assert_authorisation
-from ..flask_extend import Blueprint
-from flask import flash
+from flask import Blueprint, flash
__all__ = [
'db', 'app',