From 3f14c56860ff67e2d2a689fe3f362ad7a25631d5 Mon Sep 17 00:00:00 2001 From: Michaël Ball Date: Sun, 20 Dec 2015 15:22:16 +0000 Subject: Syntax improvements --- mach2.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mach2.py') diff --git a/mach2.py b/mach2.py index fdd86c2..8261019 100644 --- a/mach2.py +++ b/mach2.py @@ -1,17 +1,17 @@ +import base64 import configparser import json import mimetypes import os import sqlite3 -import subprocess import tempfile -import threading -from flask import Flask, Response, current_app, g, redirect, render_template +from flask import Flask, Response, g, redirect, render_template from flask import request, url_for from flask.ext.compress import Compress from flask.ext.login import LoginManager, current_user, login_required from flask.ext.login import login_user, logout_user +from gevent import subprocess from models.album import Album from models.artist import Artist @@ -66,7 +66,7 @@ def query_db(query, args=(), one=False): @login_manager.request_loader -def load_user(request): +def load_user_from_request(request): # first, try to login using the api_key url arg api_key = request.args.get('api_key', None) -- cgit v1.2.3