diff options
author | RaNaN <Mast3rRaNaN@hotmail.de> | 2011-09-22 22:46:30 +0200 |
---|---|---|
committer | RaNaN <Mast3rRaNaN@hotmail.de> | 2011-09-22 22:46:30 +0200 |
commit | fa41674089843fc931fb53ec60db5dabe3574b13 (patch) | |
tree | ca80a2681dad68b3f3fd0763386c0ab138c2378e /module | |
parent | closed #393 (diff) | |
download | pyload-fa41674089843fc931fb53ec60db5dabe3574b13.tar.xz |
fixed json import
Diffstat (limited to 'module')
-rw-r--r-- | module/common/json_layer.py (renamed from module/common/json.py) | 0 | ||||
-rw-r--r-- | module/plugins/AccountManager.py | 2 | ||||
-rw-r--r-- | module/web/api_app.py | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/module/common/json.py b/module/common/json_layer.py index e9ed003a0..e9ed003a0 100644 --- a/module/common/json.py +++ b/module/common/json_layer.py diff --git a/module/plugins/AccountManager.py b/module/plugins/AccountManager.py index 4b218d8f8..96090ef38 100644 --- a/module/plugins/AccountManager.py +++ b/module/plugins/AccountManager.py @@ -41,7 +41,7 @@ class AccountManager(): self.lock = Lock() self.initAccountPlugins() - + self.loadAccounts() self.saveAccounts() # save to add categories to conf diff --git a/module/web/api_app.py b/module/web/api_app.py index 7d1a95c58..32b128e6a 100644 --- a/module/web/api_app.py +++ b/module/web/api_app.py @@ -13,7 +13,7 @@ from utils import toDict, set_session from webinterface import PYLOAD -from module.common.json import json_dumps +from module.common.json_layer import json_dumps from module.database.UserDatabase import ROLE try: |