diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2011-10-05 21:32:54 +0200 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2011-10-05 21:32:54 +0200 |
| commit | 953cd995008098b2bd14959556811fa1757b5e76 (patch) | |
| tree | cd52bc8303e64dae9822e370b7bd4ff8b4225cc2 /module/common/json_layer.py | |
| parent | mediafire.com plugin update (still not finished) (diff) | |
| download | pyload-953cd995008098b2bd14959556811fa1757b5e76.tar.xz | |
little fix for simple_json + js engine
Diffstat (limited to 'module/common/json_layer.py')
| -rw-r--r-- | module/common/json_layer.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/module/common/json_layer.py b/module/common/json_layer.py index 7b1c80bb5..4d57a9f38 100644 --- a/module/common/json_layer.py +++ b/module/common/json_layer.py @@ -7,10 +7,7 @@ try: # since python 2.6 import json from json import loads as json_loads from json import dumps as json_dumps -except ImportError: - try: - import module.lib.simplejson as json - from module.lib.simplejson import loads as json_loads - from module.lib.simplejson import dumps as json_dumps - except: - print "Could not import simplejson" +except ImportError: #use system simplejson if available + import simplejson as json + from simplejson import loads as json_loads + from simplejson import dumps as json_dumps |