summaryrefslogtreecommitdiffstats
path: root/module/web
diff options
context:
space:
mode:
authorGravatar mkaay <mkaay@mkaay.de> 2009-12-17 21:33:13 +0100
committerGravatar mkaay <mkaay@mkaay.de> 2009-12-17 21:33:13 +0100
commitd08271cbb66f3ccbd8f3c5cf707008388ff4297e (patch)
treeedd2c3ebad7c066ab96a6a13ddaacb5c96292b4b /module/web
parentbetter Megaupload captcha detection, fixed #38 (diff)
downloadpyload-d08271cbb66f3ccbd8f3c5cf707008388ff4297e.tar.xz
new xml config for core
Diffstat (limited to 'module/web')
-rw-r--r--module/web/settings.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/module/web/settings.py b/module/web/settings.py
index 2695b0648..2c7f4ecd8 100644
--- a/module/web/settings.py
+++ b/module/web/settings.py
@@ -4,8 +4,8 @@
DEBUG = True
TEMPLATE_DEBUG = DEBUG
-import ConfigParser
import os.path
+import sys
from os import chdir
from os.path import dirname
from os.path import abspath
@@ -17,11 +17,12 @@ SERVER_VERSION = "0.3"
PROJECT_DIR = os.path.dirname(__file__)
#chdir(dirname(abspath(__file__)) + sep)
-config = ConfigParser.SafeConfigParser()
PYLOAD_DIR = os.path.join(PROJECT_DIR,"..","..")
-config.read(os.path.join(PYLOAD_DIR,"config"))
+sys.path.append(os.path.join(PYLOAD_DIR, "module"))
+from XMLConfigParser import XMLConfigParser
+config = XMLConfigParser(os.path.join(PYLOAD_DIR,"module","config","core.xml"))
ssl = ""
@@ -132,4 +133,4 @@ INSTALLED_APPS = (
AUTH_PROFILE_MODULE = 'pyload.UserProfile'
-LOGIN_URL = '/login' \ No newline at end of file
+LOGIN_URL = '/login'