From e2d4a21008fe1f44ca4d27abf2c18a85dda5df4a Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Tue, 4 Oct 2011 10:52:31 +0200
Subject: plugin cleanups

---
 module/plugins/accounts/FileserveCom.py | 6 +-----
 module/plugins/accounts/FilesonicCom.py | 7 +------
 module/plugins/accounts/WuploadCom.py   | 6 +-----
 3 files changed, 3 insertions(+), 16 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py
index 316c2446e..5e5068f22 100644
--- a/module/plugins/accounts/FileserveCom.py
+++ b/module/plugins/accounts/FileserveCom.py
@@ -20,11 +20,7 @@
 from time import mktime, strptime
 
 from module.plugins.Account import Account
-
-try:
-    from json import loads as json_loads
-except ImportError:
-    from module.lib.simplejson import loads as json_loads
+from module.common.json_layer import json_loads
 
 class FileserveCom(Account):
     __name__ = "FileserveCom"
diff --git a/module/plugins/accounts/FilesonicCom.py b/module/plugins/accounts/FilesonicCom.py
index ff4e066e2..1207f1b56 100644
--- a/module/plugins/accounts/FilesonicCom.py
+++ b/module/plugins/accounts/FilesonicCom.py
@@ -17,15 +17,10 @@
     @author: RaNaN
 """
 
-import re
 from time import mktime, strptime
 
 from module.plugins.Account import Account
-
-try:
-    from json import loads as json_loads
-except ImportError: # pragma: no cover
-    from module.lib.simplejson import loads as json_loads
+from module.common.json_layer import json_loads
 
 class FilesonicCom(Account):
     __name__ = "FilesonicCom"
diff --git a/module/plugins/accounts/WuploadCom.py b/module/plugins/accounts/WuploadCom.py
index c6710a657..b3d73df27 100644
--- a/module/plugins/accounts/WuploadCom.py
+++ b/module/plugins/accounts/WuploadCom.py
@@ -20,11 +20,7 @@
 from types import MethodType
 
 from module.plugins.Account import Account
-
-try:
-    from json import loads as json_loads
-except ImportError: # pragma: no cover
-    from module.lib.simplejson import loads as json_loads
+from module.common.json_layer import json_loads
 
 class WuploadCom(Account):
     __name__ = "WuploadCom"
-- 
cgit v1.2.3