Merge pull request #48 from OzzieIsaacs/patch-1

Fix for #45 DB_ROOT not found
This commit is contained in:
cervinko 2016-08-07 22:51:06 +02:00 committed by GitHub
commit 52ba2adf73
5 changed files with 6 additions and 7 deletions

View File

@ -5,8 +5,7 @@ import os
import sys
from configobj import ConfigObj
CONFIG_FILE= os.path.join(os.getcwd(), "config.ini")
CONFIG_FILE= os.path.join(os.path.normpath(os.path.dirname(os.path.realpath(__file__))+os.sep+".."+os.sep), "config.ini")
CFG = ConfigObj(CONFIG_FILE)
CFG.encoding='UTF-8'

View File

@ -5,7 +5,7 @@ from sqlalchemy import *
from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy.orm import *
import os
from cps import config
import config
import re
import ast

View File

@ -1,8 +1,8 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
from cps import db, ub
from cps import config
import db, ub
import config
from flask import current_app as app
import smtplib

View File

@ -5,7 +5,7 @@ from sqlalchemy import *
from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy.orm import *
import os
from cps import config
import config
from werkzeug.security import generate_password_hash
dbpath = os.path.join(config.APP_DB_ROOT, "app.db")

View File

@ -8,7 +8,7 @@ import sys
import textwrap
mimetypes.add_type('application/xhtml+xml','.xhtml')
from flask import Flask, render_template, session, request, Response, redirect, url_for, send_from_directory, make_response, g, flash, abort
from cps import db, config, ub, helper
import db, config, ub, helper
import os
import errno
from sqlalchemy.sql.expression import func