diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-05-12 17:21:33 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-05-12 17:21:33 +0200 |
| commit | 0c525f750dad3f57297836ddea02da7d42ad5969 (patch) | |
| tree | 2df5f1cd3fb29c71386e197ab782a7385b8e42bd /pyload/plugin/account/OboomCom.py | |
| parent | Merge branch 'stable' into 0.4.10 (diff) | |
| download | pyload-0c525f750dad3f57297836ddea02da7d42ad5969.tar.xz | |
Other import fixes (4)
Diffstat (limited to 'pyload/plugin/account/OboomCom.py')
| -rw-r--r-- | pyload/plugin/account/OboomCom.py | 4 |
1 files changed, 2 insertions, 2 deletions
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 |