diff options
| author |  synweap15 <shamdog+github@gmail.com>
| 2014-07-09 12:05:22 +0200 |
|---|---|---|
| committer | synweap15 <shamdog+github@gmail.com>
| 2014-07-09 12:05:22 +0200 |
| commit | ce18793af9864acdf9e9c71b7324d923a53adaad (patch) | |
| tree | 64d4543160ab55860d83a796dcf2366d951c84d5 | |
| parent | remove blank lines and unused imports (diff) | |
| download | pyload-ce18793af9864acdf9e9c71b7324d923a53adaad.tar.xz | |
fix json loads, dumps on ImportError exception
| -rw-r--r-- | module/plugins/accounts/NoPremiumPl.py | 5 | ||||
| -rw-r--r-- | module/plugins/hooks/NoPremiumPl.py | 5 | ||||
| -rw-r--r-- | module/plugins/hoster/NoPremiumPl.py | 3 |
3 files changed, 8 insertions, 5 deletions
diff --git a/module/plugins/accounts/NoPremiumPl.py b/module/plugins/accounts/NoPremiumPl.py index 494b559c3..7b4140169 100644 --- a/module/plugins/accounts/NoPremiumPl.py +++ b/module/plugins/accounts/NoPremiumPl.py @@ -7,9 +7,10 @@ from time import mktime import module.lib.beaker.crypto as crypto try: - from json import loads + from json import loads, dumps except ImportError: - from simplejson import loads + from module.common.json_layer import json_loads as loads + from module.common.json_layer import json_dumps as dumps class NoPremiumPl(Account): diff --git a/module/plugins/hooks/NoPremiumPl.py b/module/plugins/hooks/NoPremiumPl.py index 121e92f91..47aa117df 100644 --- a/module/plugins/hooks/NoPremiumPl.py +++ b/module/plugins/hooks/NoPremiumPl.py @@ -4,9 +4,10 @@ from module.plugins.internal.MultiHoster import MultiHoster from module.network.RequestFactory import getURL try: - from json import loads + from json import loads, dumps except ImportError: - from simplejson import loads + from module.common.json_layer import json_loads as loads + from module.common.json_layer import json_dumps as dumps class NoPremiumPl(MultiHoster): __name__ = "NoPremiumPl" diff --git a/module/plugins/hoster/NoPremiumPl.py b/module/plugins/hoster/NoPremiumPl.py index bd5260a55..86255f95a 100644 --- a/module/plugins/hoster/NoPremiumPl.py +++ b/module/plugins/hoster/NoPremiumPl.py @@ -3,7 +3,8 @@ try: from json import loads, dumps except ImportError: - from simplejson import loads + from module.common.json_layer import json_loads as loads + from module.common.json_layer import json_dumps as dumps from module.plugins.internal.SimpleHoster import SimpleHoster |