# HG changeset patch # User Kang Seonghoon # Date 1269467830 -32400 # Node ID 668dc5ea3abc9dd29089c65f056fc27d4f2dad29 # Parent de769eb9bddc922d391f756626527b63d35a6931 relative paths converted to absolute ones throughout the code. diff -r de769eb9bddc -r 668dc5ea3abc juviewer.py --- a/juviewer.py Thu Mar 25 06:42:46 2010 +0900 +++ b/juviewer.py Thu Mar 25 06:57:10 2010 +0900 @@ -4,9 +4,11 @@ from webase import * from lib import shorten, jubeatdb as jdb, template +import os.path application = Application(show_traceback=True) root = '' +realroot = os.path.dirname(__file__) def render(env, name, **kwargs): return template.render(env, name, root=root, **kwargs) @@ -164,7 +166,7 @@ if type: env.header('Content-Type', type) if enc: env.header('Content-Transfer-Encoding', enc) try: - fp = open('res/' + path, 'rb') + fp = open(os.path.join(realroot, 'res/' + path), 'rb') for data in iter(lambda: fp.read(4096), ''): yield data except Exception: env.status(404) diff -r de769eb9bddc -r 668dc5ea3abc juviewer.wsgi --- a/juviewer.wsgi Thu Mar 25 06:42:46 2010 +0900 +++ b/juviewer.wsgi Thu Mar 25 06:57:10 2010 +0900 @@ -1,6 +1,5 @@ # vim: syn=python import sys, os -sys.path.append(os.path.dirname(__file__)) -os.chdir(os.path.dirname(__file__)) +sys.path.insert(0, os.path.dirname(__file__)) del sys, os from juviewer import * diff -r de769eb9bddc -r 668dc5ea3abc lib/jubeatdb.py --- a/lib/jubeatdb.py Thu Mar 25 06:42:46 2010 +0900 +++ b/lib/jubeatdb.py Thu Mar 25 06:57:10 2010 +0900 @@ -3,6 +3,7 @@ import time import calendar import urllib +import os.path from sqlalchemy import create_engine, and_, or_ from sqlalchemy.sql.expression import func as sqlfunc @@ -15,7 +16,7 @@ pass class Database(object): - PATH = 'sqlite:///juviewer.db' + PATH = 'sqlite:///' + os.path.join(os.path.dirname(__file__), '../juviewer.db') engine = create_engine(PATH) sessionfactory = sessionmaker(bind=engine) diff -r de769eb9bddc -r 668dc5ea3abc lib/template.py --- a/lib/template.py Thu Mar 25 06:42:46 2010 +0900 +++ b/lib/template.py Thu Mar 25 06:57:10 2010 +0900 @@ -1,8 +1,9 @@ from __future__ import absolute_import, division, with_statement import mako.lookup, mako.exceptions +import os.path -tmpllookup = mako.lookup.TemplateLookup(directories=['tmpl'], +tmpllookup = mako.lookup.TemplateLookup(directories=[os.path.join(os.path.dirname(__file__), '../tmpl')], input_encoding='utf-8', output_encoding='utf-8', format_exceptions=True, imports=['from lib.filters import encode_sid, encode_mid, half, percent, date, graphsource, translate'])