summaryrefslogtreecommitdiffstats
path: root/module/plugins/accounts/OboomCom.py
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins/accounts/OboomCom.py')
-rw-r--r--module/plugins/accounts/OboomCom.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/module/plugins/accounts/OboomCom.py b/module/plugins/accounts/OboomCom.py
index e1ad9ca0f..cb3342e49 100644
--- a/module/plugins/accounts/OboomCom.py
+++ b/module/plugins/accounts/OboomCom.py
@@ -16,14 +16,14 @@ except ImportError:
def hexread(self, octets):
return b2a_hex(pbkdf2(self.passphrase, self.salt, self.iterations, octets))
-from module.plugins.internal.utils import json
+from module.plugins.internal.misc import json
from module.plugins.internal.Account import Account
class OboomCom(Account):
__name__ = "OboomCom"
__type__ = "account"
- __version__ = "0.30"
+ __version__ = "0.31"
__status__ = "testing"
__description__ = """Oboom.com account plugin"""
@@ -35,11 +35,12 @@ class OboomCom(Account):
salt = password[::-1]
pbkdf2 = PBKDF2(password, salt, 1000).hexread(16)
- result = json.loads(self.load("http://www.oboom.com/1/login", #@TODO: Revert to `https` in 0.4.10
- get={'auth': user,
- 'pass': pbkdf2}))
+ html = self.load("http://www.oboom.com/1/login", #@TODO: Revert to `https` in 0.4.10
+ get={'auth': user,
+ 'pass': pbkdf2})
+ result = json.loads(html)
- if result[0] != 200:
+ if result[0] is not 200:
self.log_warning(_("Failed to log in: %s") % result[1])
self.fail_login()