Commit 729cdef7 authored by Sacha's avatar Sacha Committed by SXibolet@2PITAU
Browse files

Merge branch 'master' of https://github.com/gdyer/controversy

parents 645811cc cc1d3976
...@@ -30,13 +30,11 @@ application.register_blueprint(api, url_prefix='/api') ...@@ -30,13 +30,11 @@ application.register_blueprint(api, url_prefix='/api')
application.register_blueprint(mturk, url_prefix='/training') application.register_blueprint(mturk, url_prefix='/training')
application.secret_key = SECRET_KEY application.secret_key = SECRET_KEY
class AppConfig(object): application.config['RECAPTCHA_PUBLIC_KEY'] = CAPTCHA_PUBLIC
RECAPTCHA_PUBLIC_KEY = CAPTCHA_PUBLIC application.config['RECAPTCHA_PRIVATE_KEY'] = CAPTCHA_PRIVATE
RECAPTCHA_PRIVATE_KEY = CAPTCHA_PRIVATE application.config['version'] = '0.4'
VERSION = '0.4' application.config['testing'] = DEBUG
testing = DEBUG
application.config.from_object(AppConfig)
def plain_text_resp(message, code=200): def plain_text_resp(message, code=200):
return Response(message, return Response(message,
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import db import db
from querier import new_query from querier import new_query
map(lambda entry: new_query(entry['Term']), db.histories()) map(lambda entry: new_query(entry['Term']), db.histories())
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment