From 0c525f750dad3f57297836ddea02da7d42ad5969 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 12 May 2015 17:21:33 +0200 Subject: Other import fixes (4) --- pyload/plugin/account/OboomCom.py | 4 ++-- pyload/plugin/account/SmoozedCom.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pyload/plugin/account') diff --git a/pyload/plugin/account/OboomCom.py b/pyload/plugin/account/OboomCom.py index 4669ca61e..b140b9282 100644 --- a/pyload/plugin/account/OboomCom.py +++ b/pyload/plugin/account/OboomCom.py @@ -4,8 +4,8 @@ try: from beaker.crypto.pbkdf2 import PBKDF2 except ImportError: + import binascii from beaker.crypto.pbkdf2 import pbkdf2 - from binascii import b2a_hex class PBKDF2(object): @@ -16,7 +16,7 @@ except ImportError: def hexread(self, octets): - return b2a_hex(pbkdf2(self.passphrase, self.salt, self.iterations, octets)) + return binascii.b2a_hex(pbkdf2(self.passphrase, self.salt, self.iterations, octets)) from pyload.utils import json_loads from pyload.plugin.Account import Account diff --git a/pyload/plugin/account/SmoozedCom.py b/pyload/plugin/account/SmoozedCom.py index 63381c20b..ae666b060 100644 --- a/pyload/plugin/account/SmoozedCom.py +++ b/pyload/plugin/account/SmoozedCom.py @@ -7,8 +7,8 @@ try: from beaker.crypto.pbkdf2 import PBKDF2 except ImportError: + import binascii from beaker.crypto.pbkdf2 import pbkdf2 - from binascii import b2a_hex class PBKDF2(object): @@ -19,7 +19,7 @@ except ImportError: def hexread(self, octets): - return b2a_hex(pbkdf2(self.passphrase, self.salt, self.iterations, octets)) + return binascii.b2a_hex(pbkdf2(self.passphrase, self.salt, self.iterations, octets)) from pyload.utils import json_loads from pyload.plugin.Account import Account -- cgit v1.2.3