misc. small fixes, discovered by pycharm

removed unused import
fixed format string
This commit is contained in:
Thomas Waldmann 2015-03-15 01:52:56 +01:00
parent 31f8af4423
commit 61f84efa60
2 changed files with 2 additions and 2 deletions

View file

@ -608,7 +608,7 @@ def get_implementations(meta):
maccer = maccer_mapping[meta.mac_type]
cipher = cipher_mapping[meta.cipher_type]
except KeyError:
raise UnsupportedPayloadError("compr_type %x key_type %x mac_type %x" % (
raise UnsupportedPayloadError("compr_type %x key_type %x mac_type %x cipher_type %x" % (
meta.compr_type, meta.key_type, meta.mac_type, meta.cipher_type))
return compressor, keyer, maccer, cipher

View file

@ -3,7 +3,7 @@ import re
import shutil
import tempfile
from binascii import hexlify
from attic.crypto import bytes_to_long, num_aes_blocks
from attic.crypto import bytes_to_long
from attic.testsuite import AtticTestCase
from attic.key import PlaintextKey, PassphraseKey, KeyfileKey, COMPR_DEFAULT
from attic.helpers import Location, unhexlify