Flask update

couchpotato/__init__.py

@@ -3,9 +3,9 @@ from couchpotato.core.event import fireEvent
 from couchpotato.core.logger import CPLog
 from couchpotato.environment import Env
 from flask.app import Flask
+from flask.blueprints import Blueprint
 from flask.globals import request
 from flask.helpers import url_for
-from flask.module import Module
 from flask.templating import render_template
 from sqlalchemy.engine import create_engine
 from sqlalchemy.orm import scoped_session
@@ -16,7 +16,7 @@ import os
 log = CPLog(__name__)
 
 app = Flask(__name__)
-web = Module(__name__, 'web')
+web = Blueprint('web', __name__)
 
 
 def get_session(engine = None):

couchpotato/api/__init__.py

@@ -1,7 +1,7 @@
 from couchpotato.core.helpers.request import jsonified
-from flask import Module
+from flask.blueprints import Blueprint
 
-api = Module(__name__)
+api = Blueprint('api', __name__)
 
 def addApiView(route, func, static = False):
     api.add_url_rule(route + ('' if static else '/'), endpoint = route if route else 'index', view_func = func)

couchpotato/cli.py

@@ -132,14 +132,15 @@ def cmd_couchpotato(base_path, args):
     app.port = Env.setting('port', default = 5000)
     app.debug = debug
     app.secret_key = api_key
-    app.static_path = url_base + '/static'
-    app.add_url_rule(app.static_path + '/<path:filename>',
+
+    # Static path
+    web.add_url_rule(url_base + '/static/<path:filename>',
                       endpoint = 'static',
                       view_func = app.send_static_file)
 
     # Register modules
-    app.register_module(web, url_prefix = '%s/' % url_base)
-    app.register_module(api, url_prefix = '%s/%s/' % (url_base, api_key))
+    app.register_blueprint(web, url_prefix = '%s/' % url_base)
+    app.register_blueprint(api, url_prefix = '%s/%s/' % (url_base, api_key))
 
     # Go go go!
     app.run(use_reloader = reloader)