Merge branch 'master' of https://github.com/whtsky/catsup

Conflicts:
	catsup/config.py

Author: whtsky

catsup/config.py

@@ -38,7 +38,6 @@
 define('common_template_path', type=str, default=os.path.join(options.catsup_path, 'template'), help='common template path')
 define('deploy_path', type=str, default=os.path.join(os.path.dirname(options.catsup_path), 'deploy'), help='catsup deploy path')
 define('themes_path', type=str, default=os.path.join(options.catsup_path, 'themes'), help='themes path')
-#define('ui_module_path', type=str, default=os.path.join(options.common_template_path, 'modules'), help='Tornado UIModule path')
 define('settings', type=str, default=os.path.join(os.path.expanduser('~'), '.catsuprc'), help='catsup settings file path')
 
 # for catsup use, do not delete them

catsup/uimodules.py

@@ -1,4 +1,4 @@
-#-* coding:utf-8 -*-
+#coding=utf-8
 from tornado.web import UIModule
 from tornado.options import options
 

catsup/utils.py

@@ -1,3 +1,4 @@
+#coding=utf-8
 from __future__ import with_statement
 
 import os

setup.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
+#coding=utf-8
 
 from setuptools import setup, find_packages