summaryrefslogtreecommitdiffstats
path: root/module/config
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2013-05-24 21:06:34 +0200
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2013-05-24 21:06:34 +0200
commitca43deb9769b4a6a9cfb7fbab7fb4d2256c2c403 (patch)
treee1527647682e6907ac8a0848e42dad68190f9813 /module/config
parentfixed loading of js files (diff)
downloadpyload-ca43deb9769b4a6a9cfb7fbab7fb4d2256c2c403.tar.xz
moved common to utils package
Diffstat (limited to 'module/config')
-rw-r--r--module/config/ConfigManager.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/module/config/ConfigManager.py b/module/config/ConfigManager.py
index b1cb05d53..85088020b 100644
--- a/module/config/ConfigManager.py
+++ b/module/config/ConfigManager.py
@@ -4,8 +4,7 @@
from new_collections import OrderedDict
from module.Api import InvalidConfigSection
-from module.common.json_layer import json
-from module.utils import from_string, primary_uid
+from module.utils import from_string, primary_uid, json
from ConfigParser import ConfigParser