diff options
Diffstat (limited to 'module/plugins')
| -rw-r--r-- | module/plugins/PluginManager.py | 2 | ||||
| -rw-r--r-- | module/plugins/accounts/FilesonicCom.py | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/module/plugins/PluginManager.py b/module/plugins/PluginManager.py index 9f59cb1de..f583f91de 100644 --- a/module/plugins/PluginManager.py +++ b/module/plugins/PluginManager.py @@ -247,7 +247,7 @@ class PluginManager(): if plugin.has_key("new_name"): return plugin["new_name"] - return plugin["name"] + return name diff --git a/module/plugins/accounts/FilesonicCom.py b/module/plugins/accounts/FilesonicCom.py index 7ea7ea7cb..9f57809ad 100644 --- a/module/plugins/accounts/FilesonicCom.py +++ b/module/plugins/accounts/FilesonicCom.py @@ -22,10 +22,10 @@ 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
+try: + from json import loads as json_loads +except ImportError: # pragma: no cover + from module.lib.simplejson import loads as json_loads class FilesonicCom(Account): @@ -45,7 +45,7 @@ class FilesonicCom(Account): post = {"u": user, "p" : self.accounts[user]["password"]} ).decode("utf8") - self.core.log.debug(_("%s: account status retrieved from api %s" % (self.__name__,xml))) + self.core.log.debug("%s: account status retrieved from api %s" % (self.__name__,xml)) json = json_loads(xml) if json["FSApi_User"]["getInfo"]["status"] != "success": self.core.log.error(_("%s: Invalid login retrieving user details" % self.__name__)) |