Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
SerhoLiu committed Jun 28, 2015
2 parents 0378ae7 + f3aac24 commit b90898d
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ css:
lessc $(LESSPATH)effector.less > $(LESSPATH)style.css

mincss:
lessc --yui-compress $(LESSPATH)effector.less > $(LESSPATH)style.min.css
lessc $(LESSPATH)effector.less --clean-css="--s1 --advanced" > $(LESSPATH)style.min.css

run:
python run.py
Expand Down
16 changes: 9 additions & 7 deletions miniakio/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,24 @@

import os.path
import tornado.web

from .libs import sqlite3lib
from .blog import handlers as handler

from blogconfig import COOKIE_SECRET, DATABASE, DEBUG


class Application(tornado.web.Application):
def __init__(self):
handlers = handler
settings = dict(
template_path = os.path.join(os.path.dirname(__file__), "templates"),
static_path = os.path.join(os.path.dirname(__file__), "static"),
xsrf_cookies = True,
cookie_secret = COOKIE_SECRET,
login_url = "/auth/signin",
autoescape = None,
debug = DEBUG,
template_path=os.path.join(os.path.dirname(__file__), "templates"),
static_path=os.path.join(os.path.dirname(__file__), "static"),
xsrf_cookies=True,
cookie_secret=COOKIE_SECRET,
login_url="/auth/signin",
autoescape=None,
debug=DEBUG,
)
tornado.web.Application.__init__(self, handlers, **settings)
self.db = sqlite3lib.Connection(DATABASE)
3 changes: 3 additions & 0 deletions miniakio/libs/crypto.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-

"""
Django's standard crypto functions and utilities.
"""
Expand Down

0 comments on commit b90898d

Please sign in to comment.