diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2010-07-29 12:09:42 +0200 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2010-07-29 12:09:42 +0200 |
| commit | 2ba07aa53d2af572af2c5a43e77725abd46e1b13 (patch) | |
| tree | 89ff915a3a476dd9431d38c6e2b39b9de1aeb0f5 /module/web/settings.py | |
| parent | Added tag working for changeset 3cca18acfe7d (diff) | |
| download | pyload-2ba07aa53d2af572af2c5a43e77725abd46e1b13.tar.xz | |
many new stuff, some things already working
Diffstat (limited to 'module/web/settings.py')
| -rw-r--r-- | module/web/settings.py | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/module/web/settings.py b/module/web/settings.py index 8f9425198..7380541e6 100644 --- a/module/web/settings.py +++ b/module/web/settings.py @@ -15,9 +15,17 @@ PROJECT_DIR = os.path.dirname(__file__) PYLOAD_DIR = os.path.join(PROJECT_DIR,"..","..")
+sys.path.append(PYLOAD_DIR)
+
+
sys.path.append(os.path.join(PYLOAD_DIR, "module"))
-from XMLConfigParser import XMLConfigParser
-config = XMLConfigParser(os.path.join(PYLOAD_DIR,"module","config","core.xml"))
+
+import InitHomeDir
+sys.path.append(pypath)
+
+
+from module.ConfigParser import ConfigParser
+config = ConfigParser()
#DEBUG = config.get("general","debug")
@@ -35,8 +43,8 @@ except: server_url = "http%s://%s:%s@%s:%s/" % (
ssl,
- config.get("remote", "username"),
- config.get("remote", "password"),
+ config.username,
+ config.password,
config.get("remote", "listenaddr"),
config.get("remote", "port")
)
|