craftin/PGPy-3_13_patch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

big PEP8 pass

Browse Source
This commit is contained in:
Michael Greene
2022-11-23 17:15:45 -08:00
parent d80d273921
commit eb99007b3a
13 changed files with 138 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/source/api/exceptions.rst
View File

@@ -20,15 +20,15 @@ Exceptions
.. autoexception:: PGPDecryptionError .. autoexception:: PGPDecryptionError
:py:class:`PGPOpenSSLCipherNotSupported` :py:class:`PGPOpenSSLCipherNotSupportedError`
---------------------------------------- ----------------------------------------
.. autoexception:: PGPOpenSSLCipherNotSupported .. autoexception:: PGPOpenSSLCipherNotSupportedError
:py:class:`PGPInsecureCipher` :py:class:`PGPInsecureCipherError`
----------------------------- -----------------------------
.. autoexception:: PGPInsecureCipher .. autoexception:: PGPInsecureCipherError
:py:class:`WontImplementError` :py:class:`WontImplementError`
------------------------------ ------------------------------

16
pgpy/_curves.py
View File

@@ -49,25 +49,25 @@ if use_legacy_cryptography_decorator():
key_size = 256 key_size = 256
@utils.register_interface(ec.EllipticCurve) @utils.register_interface(ec.EllipticCurve) # noqa: E303
class BrainpoolP384R1(object): class BrainpoolP384R1(object):
name = 'brainpoolP384r1' name = 'brainpoolP384r1'
key_size = 384 key_size = 384
@utils.register_interface(ec.EllipticCurve) @utils.register_interface(ec.EllipticCurve) # noqa: E303
class BrainpoolP512R1(object): class BrainpoolP512R1(object):
name = 'brainpoolP512r1' name = 'brainpoolP512r1'
key_size = 512 key_size = 512
@utils.register_interface(ec.EllipticCurve) @utils.register_interface(ec.EllipticCurve) # noqa: E303
class X25519(object): class X25519(object):
name = 'X25519' name = 'X25519'
key_size = 256 key_size = 256
@utils.register_interface(ec.EllipticCurve) @utils.register_interface(ec.EllipticCurve) # noqa: E303
class Ed25519(object): class Ed25519(object):
name = 'ed25519' name = 'ed25519'
key_size = 256 key_size = 256
@@ -77,22 +77,22 @@ else:
key_size = 256 key_size = 256
class BrainpoolP384R1(ec.EllipticCurve): class BrainpoolP384R1(ec.EllipticCurve): # noqa: E303
name = 'brainpoolP384r1' name = 'brainpoolP384r1'
key_size = 384 key_size = 384
class BrainpoolP512R1(ec.EllipticCurve): class BrainpoolP512R1(ec.EllipticCurve): # noqa: E303
name = 'brainpoolP512r1' name = 'brainpoolP512r1'
key_size = 512 key_size = 512
class X25519(ec.EllipticCurve): class X25519(ec.EllipticCurve): # noqa: E303
name = 'X25519' name = 'X25519'
key_size = 256 key_size = 256
class Ed25519(ec.EllipticCurve): class Ed25519(ec.EllipticCurve): # noqa: E303
name = 'ed25519' name = 'ed25519'
key_size = 256 key_size = 256

47
pgpy/constants.py
View File

@@ -4,7 +4,6 @@ import bz2
import hashlib import hashlib
import imghdr import imghdr
import os import os
import time
import zlib import zlib
import warnings import warnings
@@ -23,27 +22,29 @@ from .types import FlagEnum
from .decorators import classproperty from .decorators import classproperty
from ._curves import BrainpoolP256R1, BrainpoolP384R1, BrainpoolP512R1, X25519, Ed25519 from ._curves import BrainpoolP256R1, BrainpoolP384R1, BrainpoolP512R1, X25519, Ed25519
__all__ = ['Backend', __all__ = [
'EllipticCurveOID', 'Backend',
'ECPointFormat', 'EllipticCurveOID',
'PacketTag', 'ECPointFormat',
'SymmetricKeyAlgorithm', 'PacketTag',
'PubKeyAlgorithm', 'SymmetricKeyAlgorithm',
'CompressionAlgorithm', 'PubKeyAlgorithm',
'HashAlgorithm', 'CompressionAlgorithm',
'RevocationReason', 'HashAlgorithm',
'ImageEncoding', 'RevocationReason',
'SignatureType', 'ImageEncoding',
'KeyServerPreferences', 'SignatureType',
'S2KGNUExtension', 'KeyServerPreferences',
'SecurityIssues', 'S2KGNUExtension',
'String2KeyType', 'SecurityIssues',
'TrustLevel', 'String2KeyType',
'KeyFlags', 'TrustLevel',
'Features', 'KeyFlags',
'RevocationKeyClass', 'Features',
'NotationDataFlags', 'RevocationKeyClass',
'TrustFlags',] 'NotationDataFlags',
'TrustFlags',
]
# this is 50 KiB # this is 50 KiB
@@ -621,7 +622,7 @@ MINIMUM_ASYMMETRIC_KEY_LENGTHS = {
PubKeyAlgorithm.RSASign: 2048, PubKeyAlgorithm.RSASign: 2048,
PubKeyAlgorithm.ElGamal: 2048, PubKeyAlgorithm.ElGamal: 2048,
PubKeyAlgorithm.DSA: 2048, PubKeyAlgorithm.DSA: 2048,
##
PubKeyAlgorithm.ECDSA: SAFE_CURVES, PubKeyAlgorithm.ECDSA: SAFE_CURVES,
PubKeyAlgorithm.EdDSA: SAFE_CURVES, PubKeyAlgorithm.EdDSA: SAFE_CURVES,
PubKeyAlgorithm.ECDH: SAFE_CURVES, PubKeyAlgorithm.ECDH: SAFE_CURVES,

12
pgpy/errors.py
View File

@@ -4,9 +4,9 @@
__all__ = ('PGPError', __all__ = ('PGPError',
'PGPEncryptionError', 'PGPEncryptionError',
'PGPDecryptionError', 'PGPDecryptionError',
'PGPIncompatibleECPointFormat', 'PGPIncompatibleECPointFormatError',
'PGPOpenSSLCipherNotSupported', 'PGPOpenSSLCipherNotSupportedError',
'PGPInsecureCipher', 'PGPInsecureCipherError',
'WontImplementError',) 'WontImplementError',)
@@ -25,17 +25,17 @@ class PGPDecryptionError(Exception):
pass pass
class PGPIncompatibleECPointFormat(Exception): class PGPIncompatibleECPointFormatError(Exception):
"""Raised when the point format is incompatible with the elliptic curve""" """Raised when the point format is incompatible with the elliptic curve"""
pass pass
class PGPOpenSSLCipherNotSupported(Exception): class PGPOpenSSLCipherNotSupportedError(Exception):
"""Raised when OpenSSL does not support the requested cipher""" """Raised when OpenSSL does not support the requested cipher"""
pass pass
class PGPInsecureCipher(Exception): class PGPInsecureCipherError(Exception):
"""Raised when a cipher known to be insecure is attempted to be used to encrypt data""" """Raised when a cipher known to be insecure is attempted to be used to encrypt data"""
pass pass

32
pgpy/packet/fields.py
View File

@@ -63,7 +63,7 @@ from ..decorators import sdproperty
from ..errors import PGPDecryptionError from ..errors import PGPDecryptionError
from ..errors import PGPError from ..errors import PGPError
from ..errors import PGPIncompatibleECPointFormat from ..errors import PGPIncompatibleECPointFormatError
from ..symenc import _decrypt from ..symenc import _decrypt
from ..symenc import _encrypt from ..symenc import _encrypt
@@ -371,8 +371,8 @@ class EdDSASignature(DSASignature):
def __sig__(self): def __sig__(self):
# TODO: change this length when EdDSA can be used with another curve (Ed448) # TODO: change this length when EdDSA can be used with another curve (Ed448)
l = (EllipticCurveOID.Ed25519.key_size + 7) // 8 siglen = (EllipticCurveOID.Ed25519.key_size + 7) // 8
return self.int_to_bytes(self.r, l) + self.int_to_bytes(self.s, l) return self.int_to_bytes(self.r, l) + self.int_to_bytes(self.s, siglen)
class PubKey(MPIs): class PubKey(MPIs):
@@ -500,7 +500,7 @@ class ECPoint:
self.x = MPI(MPIs.bytes_to_int(xy[:self.bytelen])) self.x = MPI(MPIs.bytes_to_int(xy[:self.bytelen]))
self.y = MPI(MPIs.bytes_to_int(xy[self.bytelen:])) self.y = MPI(MPIs.bytes_to_int(xy[self.bytelen:]))
elif self.format == ECPointFormat.Native: elif self.format == ECPointFormat.Native:
self.bytelen = 0 # dummy value for copy self.bytelen = 0 # dummy value for copy
self.x = bytes(xy) self.x = bytes(xy)
self.y = None self.y = None
else: else:
@@ -592,7 +592,7 @@ class ECDSAPub(PubKey):
self.p = ECPoint(packet) self.p = ECPoint(packet)
if self.p.format != ECPointFormat.Standard: if self.p.format != ECPointFormat.Standard:
raise PGPIncompatibleECPointFormat("Only Standard format is valid for ECDSA") raise PGPIncompatibleECPointFormatError("Only Standard format is valid for ECDSA")
class EdDSAPub(PubKey): class EdDSAPub(PubKey):
@@ -643,7 +643,7 @@ class EdDSAPub(PubKey):
self.p = ECPoint(packet) self.p = ECPoint(packet)
if self.p.format != ECPointFormat.Native: if self.p.format != ECPointFormat.Native:
raise PGPIncompatibleECPointFormat("Only Native format is valid for EdDSA") raise PGPIncompatibleECPointFormatError("Only Native format is valid for EdDSA")
class ECDHPub(PubKey): class ECDHPub(PubKey):
@@ -718,9 +718,9 @@ class ECDHPub(PubKey):
self.p = ECPoint(packet) self.p = ECPoint(packet)
if self.oid == EllipticCurveOID.Curve25519: if self.oid == EllipticCurveOID.Curve25519:
if self.p.format != ECPointFormat.Native: if self.p.format != ECPointFormat.Native:
raise PGPIncompatibleECPointFormat("Only Native format is valid for Curve25519") raise PGPIncompatibleECPointFormatError("Only Native format is valid for Curve25519")
elif self.p.format != ECPointFormat.Standard: elif self.p.format != ECPointFormat.Standard:
raise PGPIncompatibleECPointFormat("Only Standard format is valid for this curve") raise PGPIncompatibleECPointFormatError("Only Standard format is valid for this curve")
self.kdf.parse(packet) self.kdf.parse(packet)
@@ -1177,14 +1177,14 @@ class PrivKey(PubKey):
return _bytes return _bytes
def __len__(self): def __len__(self):
l = super(PrivKey, self).__len__() + len(self.s2k) + len(self.chksum) nbytes = super(PrivKey, self).__len__() + len(self.s2k) + len(self.chksum)
if self.s2k: if self.s2k:
l += len(self.encbytes) nbytes += len(self.encbytes)
else: else:
l += sum(len(getattr(self, i)) for i in self.__privfields__) nbytes += sum(len(getattr(self, i)) for i in self.__privfields__)
return l return nbytes
def __copy__(self): def __copy__(self):
pk = super(PrivKey, self).__copy__() pk = super(PrivKey, self).__copy__()
@@ -1582,12 +1582,12 @@ class ECDHPriv(ECDSAPriv, ECDHPub):
return _b return _b
def __len__(self): def __len__(self):
l = ECDHPub.__len__(self) + len(self.s2k) + len(self.chksum) nbytes = ECDHPub.__len__(self) + len(self.s2k) + len(self.chksum)
if self.s2k: if self.s2k:
l += len(self.encbytes) nbytes += len(self.encbytes)
else: else:
l += sum(len(getattr(self, i)) for i in self.__privfields__) nbytes += sum(len(getattr(self, i)) for i in self.__privfields__)
return l return nbytes
def __privkey__(self): def __privkey__(self):
if self.oid == EllipticCurveOID.Curve25519: if self.oid == EllipticCurveOID.Curve25519:

18
pgpy/packet/packets.py
View File

@@ -6,7 +6,6 @@ import calendar
import copy import copy
import hashlib import hashlib
import os import os
import re
import warnings import warnings
from datetime import datetime, timezone from datetime import datetime, timezone
@@ -359,12 +358,14 @@ class SignatureV4(Signature):
def pubalg_int(self, val): def pubalg_int(self, val):
self._pubalg = PubKeyAlgorithm(val) self._pubalg = PubKeyAlgorithm(val)
sigs = {PubKeyAlgorithm.RSAEncryptOrSign: RSASignature, sigs = {
PubKeyAlgorithm.RSAEncrypt: RSASignature, PubKeyAlgorithm.RSAEncryptOrSign: RSASignature,
PubKeyAlgorithm.RSASign: RSASignature, PubKeyAlgorithm.RSAEncrypt: RSASignature,
PubKeyAlgorithm.DSA: DSASignature, PubKeyAlgorithm.RSASign: RSASignature,
PubKeyAlgorithm.ECDSA: ECDSASignature, PubKeyAlgorithm.DSA: DSASignature,
PubKeyAlgorithm.EdDSA: EdDSASignature,} PubKeyAlgorithm.ECDSA: ECDSASignature,
PubKeyAlgorithm.EdDSA: EdDSASignature,
}
self.signature = sigs.get(self.pubalg, OpaqueSignature)() self.signature = sigs.get(self.pubalg, OpaqueSignature)()
@@ -427,7 +428,6 @@ class SignatureV4(Signature):
with the length-of-length set to zero.) The unhashed subpacket data with the length-of-length set to zero.) The unhashed subpacket data
of the Signature packet being hashed is not included in the hash, and of the Signature packet being hashed is not included in the hash, and
the unhashed subpacket data length value is set to zero. the unhashed subpacket data length value is set to zero.
''' '''
_body = bytearray() _body = bytearray()
_body += self.int_to_bytes(self.header.version) _body += self.int_to_bytes(self.header.version)
@@ -435,7 +435,7 @@ class SignatureV4(Signature):
_body += self.int_to_bytes(self.pubalg) _body += self.int_to_bytes(self.pubalg)
_body += self.int_to_bytes(self.halg) _body += self.int_to_bytes(self.halg)
_body += self.subpackets.__hashbytearray__() _body += self.subpackets.__hashbytearray__()
_body += self.int_to_bytes(0, minlen=2) # empty unhashed subpackets _body += self.int_to_bytes(0, minlen=2) # empty unhashed subpackets
_body += self.hash2 _body += self.hash2
_body += self.signature.__bytearray__() _body += self.signature.__bytearray__()

2
pgpy/packet/subpackets/signature.py
View File

@@ -703,9 +703,11 @@ class KeyServerPreferences(ByteFlag):
class PreferredKeyServer(URI): class PreferredKeyServer(URI):
__typeid__ = 0x18 __typeid__ = 0x18
class SubkeyBindingSignature(Signature): class SubkeyBindingSignature(Signature):
__typeid__ = 0x18 __typeid__ = 0x18
class PrimaryUserID(SubkeyBindingSignature): class PrimaryUserID(SubkeyBindingSignature):
__typeid__ = 0x19 __typeid__ = 0x19

9
pgpy/packet/subpackets/types.py
View File

@@ -77,10 +77,11 @@ class SubPacket(Dispatchable):
super(SubPacket, self).__init__() super(SubPacket, self).__init__()
self.header = Header() self.header = Header()
# if self.__typeid__ not in [-1, None]: if (
if (self.header.typeid == -1 and self.header.typeid == -1
(not hasattr(self.__typeid__, '__abstractmethod__')) and and (not hasattr(self.__typeid__, '__abstractmethod__'))
(self.__typeid__ not in [-1, None])): and (self.__typeid__ not in {-1, None})
):
self.header.typeid = self.__typeid__ self.header.typeid = self.__typeid__
def __bytearray__(self): def __bytearray__(self):

30
pgpy/pgp.py
View File

@@ -47,7 +47,6 @@ from .packet import Packet
from .packet import Primary from .packet import Primary
from .packet import Private from .packet import Private
from .packet import PubKeyV4 from .packet import PubKeyV4
from .packet import PubSubKeyV4
from .packet import PrivKeyV4 from .packet import PrivKeyV4
from .packet import PrivSubKeyV4 from .packet import PrivSubKeyV4
from .packet import Public from .packet import Public
@@ -88,6 +87,7 @@ __all__ = ['PGPSignature',
class PGPSignature(Armorable, ParentRef, PGPObject): class PGPSignature(Armorable, ParentRef, PGPObject):
_reason_for_revocation = collections.namedtuple('ReasonForRevocation', ['code', 'comment']) _reason_for_revocation = collections.namedtuple('ReasonForRevocation', ['code', 'comment'])
@property @property
def __sig__(self): def __sig__(self):
return self._signature.signature.__sig__() return self._signature.signature.__sig__()
@@ -284,7 +284,7 @@ class PGPSignature(Armorable, ParentRef, PGPObject):
for n in self._signature.subpackets['h_AttestedCertifications']: for n in self._signature.subpackets['h_AttestedCertifications']:
attestations = bytes(n.attested_certifications) attestations = bytes(n.attested_certifications)
for i in range(0, len(attestations), hlen): for i in range(0, len(attestations), hlen):
ret.add(attestations[i:i+hlen]) ret.add(attestations[i:i + hlen])
return ret return ret
@property @property
@@ -326,7 +326,7 @@ class PGPSignature(Armorable, ParentRef, PGPObject):
sig = PGPSignature() sig = PGPSignature()
if created is None: if created is None:
created=datetime.now(timezone.utc) created = datetime.now(timezone.utc)
sigpkt = SignatureV4() sigpkt = SignatureV4()
sigpkt.header.tag = 2 sigpkt.header.tag = 2
sigpkt.header.version = 4 sigpkt.header.version = 4
@@ -600,9 +600,9 @@ class PGPUID(ParentRef):
def _splitstring(self): def _splitstring(self):
'''returns name, comment email from User ID string''' '''returns name, comment email from User ID string'''
if not isinstance(self._uid, UserID): if not isinstance(self._uid, UserID):
return ("", "", "") return "", "", ""
if self._uid.uid == "": if self._uid.uid == "":
return ("", "", "") return "", "", ""
rfc2822 = re.match(r"""^ rfc2822 = re.match(r"""^
# name should always match something # name should always match something
(?P<name>.+?) (?P<name>.+?)
@@ -619,7 +619,6 @@ class PGPUID(ParentRef):
return (rfc2822['name'], rfc2822['comment'] or "", rfc2822['email'] or "") return (rfc2822['name'], rfc2822['comment'] or "", rfc2822['email'] or "")
@property @property
def name(self): def name(self):
"""If this is a User ID, the stored name. If this is not a User ID, this will be an empty string.""" """If this is a User ID, the stored name. If this is not a User ID, this will be an empty string."""
@@ -633,7 +632,6 @@ class PGPUID(ParentRef):
""" """
return self._splitstring()[1] return self._splitstring()[1]
@property @property
def email(self): def email(self):
""" """
@@ -1699,8 +1697,10 @@ class PGPKey(Armorable, ParentRef, PGPObject):
self._uids.insort(other) self._uids.insort(other)
else: else:
raise TypeError("unsupported operand type(s) for |: '{:s}' and '{:s}'" raise TypeError(
"".format(self.__class__.__name__, other.__class__.__name__)) "unsupported operand type(s) for |: '{:s}' and '{:s}'"
"".format(self.__class__.__name__, other.__class__.__name__)
)
if isinstance(self._sibling, weakref.ref) and not from_sib: if isinstance(self._sibling, weakref.ref) and not from_sib:
sib = self._sibling() sib = self._sibling()
@@ -2366,10 +2366,10 @@ class PGPKey(Armorable, ParentRef, PGPObject):
return res return res
def self_verify(self): def self_verify(self):
selfSigs = list(self.self_signatures) self_sigs = list(self.self_signatures)
res = SecurityIssues.OK res = SecurityIssues.OK
if selfSigs: if self_sigs:
for s in selfSigs: for s in self_sigs:
if not self.verify(self, s): if not self.verify(self, s):
res |= SecurityIssues.Invalid res |= SecurityIssues.Invalid
break break
@@ -2379,9 +2379,8 @@ class PGPKey(Armorable, ParentRef, PGPObject):
def _do_self_signatures_verification(self): def _do_self_signatures_verification(self):
try: try:
self._self_verified = SecurityIssues.OK
self._self_verified = self.self_verify() self._self_verified = self.self_verify()
except: except Exception:
self._self_verified = None self._self_verified = None
raise raise
@@ -2614,7 +2613,8 @@ class PGPKey(Armorable, ParentRef, PGPObject):
# last holds the last non-signature thing processed # last holds the last non-signature thing processed
##TODO: see issue #141 and fix this better ##TODO: see issue #141 and fix this better
_getpkt = lambda d: (Packet(d) if d else None) # flake8: noqa def _getpkt(d):
return Packet(d) if d else None
# some packets are filtered out # some packets are filtered out
getpkt = filter(lambda p: p.header.tag != PacketTag.Trust, iter(functools.partial(_getpkt, data), None)) getpkt = filter(lambda p: p.header.tag != PacketTag.Trust, iter(functools.partial(_getpkt, data), None))

4
pgpy/symenc.py
View File

@@ -9,7 +9,7 @@ from cryptography.hazmat.primitives.ciphers import modes
from .errors import PGPDecryptionError from .errors import PGPDecryptionError
from .errors import PGPEncryptionError from .errors import PGPEncryptionError
from .errors import PGPInsecureCipher from .errors import PGPInsecureCipherError
__all__ = ['_encrypt', __all__ = ['_encrypt',
'_decrypt'] '_decrypt']
@@ -20,7 +20,7 @@ def _encrypt(pt, key, alg, iv=None):
iv = b'\x00' * (alg.block_size // 8) iv = b'\x00' * (alg.block_size // 8)
if alg.is_insecure: if alg.is_insecure:
raise PGPInsecureCipher("{:s} is not secure. Do not use it for encryption!".format(alg.name)) raise PGPInsecureCipherError("{:s} is not secure. Do not use it for encryption!".format(alg.name))
if not alg.is_supported: if not alg.is_supported:
raise PGPEncryptionError("Cipher {:s} not supported".format(alg.name)) raise PGPEncryptionError("Cipher {:s} not supported".format(alg.name))

46
pgpy/types.py
View File

@@ -316,21 +316,21 @@ class Field(PGPObject):
class Header(Field): class Header(Field):
@staticmethod @staticmethod
def encode_length(l, nhf=True, llen=1): def encode_length(length, nhf=True, llen=1):
def _new_length(l): def _new_length(nl):
if 192 > l: if 192 > nl:
return Header.int_to_bytes(l) return Header.int_to_bytes(nl)
elif 8384 > l: elif 8384 > nl:
elen = ((l & 0xFF00) + (192 << 8)) + ((l & 0xFF) - 192) elen = ((nl & 0xFF00) + (192 << 8)) + ((nl & 0xFF) - 192)
return Header.int_to_bytes(elen, 2) return Header.int_to_bytes(elen, 2)
return b'\xFF' + Header.int_to_bytes(l, 4) return b'\xFF' + Header.int_to_bytes(nl, 4)
def _old_length(l, llen): def _old_length(nl, llen):
return Header.int_to_bytes(l, llen) if llen > 0 else b'' return Header.int_to_bytes(nl, llen) if llen > 0 else b''
return _new_length(l) if nhf else _old_length(l, llen) return _new_length(length) if nhf else _old_length(length, llen)
@sdproperty @sdproperty
def length(self): def length(self):
@@ -390,12 +390,11 @@ class Header(Field):
@sdproperty @sdproperty
def llen(self): def llen(self):
l = self.length
lf = self._lenfmt lf = self._lenfmt
if lf == 1: if lf == 1:
# new-format length # new-format length
if 192 > l: if 192 > self.length:
return 1 return 1
elif 8384 > self.length: # >= 192 is implied elif 8384 > self.length: # >= 192 is implied
@@ -476,12 +475,15 @@ class MetaDispatchable(abc.ABCMeta):
MetaDispatchable._roots.add(ncls) MetaDispatchable._roots.add(ncls)
elif issubclass(ncls, tuple(MetaDispatchable._roots)) and ncls.__typeid__ != -1: elif issubclass(ncls, tuple(MetaDispatchable._roots)) and ncls.__typeid__ != -1:
for rcls in [ root for root in MetaDispatchable._roots if issubclass(ncls, root) ]: for rcls in (root for root in MetaDispatchable._roots if issubclass(ncls, root)):
if (rcls, ncls.__typeid__) not in MetaDispatchable._registry: if (rcls, ncls.__typeid__) not in MetaDispatchable._registry:
MetaDispatchable._registry[(rcls, ncls.__typeid__)] = ncls MetaDispatchable._registry[(rcls, ncls.__typeid__)] = ncls
if (ncls.__ver__ is not None and ncls.__ver__ > 0 and if (
(rcls, ncls.__typeid__, ncls.__ver__) not in MetaDispatchable._registry): ncls.__ver__ is not None
and ncls.__ver__ > 0
and (rcls, ncls.__typeid__, ncls.__ver__) not in MetaDispatchable._registry
):
MetaDispatchable._registry[(rcls, ncls.__typeid__, ncls.__ver__)] = ncls MetaDispatchable._registry[(rcls, ncls.__typeid__, ncls.__ver__)] = ncls
# finally, return the new class object # finally, return the new class object
@@ -637,7 +639,10 @@ class SignatureVerification(object):
return self return self
def __repr__(self): def __repr__(self):
return "<"+ self.__class__.__name__ + "({" + str(bool(self)) + "})>" return '<{classname}({val})>'.format(
classname=self.__class__.__name__,
val=bool(self)
)
def add_sigsubj(self, signature, by, subject=None, issues=None): def add_sigsubj(self, signature, by, subject=None, issues=None):
if issues is None: if issues is None:
@@ -712,13 +717,16 @@ class Fingerprint(str):
raise ValueError("Expected: String of 40 hex digits") raise ValueError("Expected: String of 40 hex digits")
halves = [ halves = [
[content[i:i+4] for i in range(0, 20, 4)], [content[i:i + 4] for i in range(0, 20, 4)],
[content[i:i+4] for i in range(20, 40, 4)] [content[i:i + 4] for i in range(20, 40, 4)]
] ]
return ' '.join(' '.join(c for c in half) for half in halves) return ' '.join(' '.join(c for c in half) for half in halves)
def __repr__(self): def __repr__(self):
return self.__class__.__name__+"("+repr(self.__pretty__())+")" return '{classname}({fp})'.format(
classname=self.__class__.__name__,
fp=self.__pretty__()
)
class SorteDeque(collections.deque): class SorteDeque(collections.deque):

5
tests/test_10_exceptions.py
View File

@@ -17,13 +17,12 @@ from pgpy.constants import PubKeyAlgorithm
from pgpy.constants import SymmetricKeyAlgorithm from pgpy.constants import SymmetricKeyAlgorithm
from pgpy.packet import Packet from pgpy.packet import Packet
from pgpy.types import Armorable from pgpy.types import Armorable
from pgpy.types import PGPObject
from pgpy.types import Fingerprint from pgpy.types import Fingerprint
from pgpy.types import SignatureVerification from pgpy.types import SignatureVerification
from pgpy.errors import PGPError from pgpy.errors import PGPError
from pgpy.errors import PGPDecryptionError from pgpy.errors import PGPDecryptionError
from pgpy.errors import PGPEncryptionError from pgpy.errors import PGPEncryptionError
from pgpy.errors import PGPInsecureCipher from pgpy.errors import PGPInsecureCipherError
def _read(f, mode='r'): def _read(f, mode='r'):
@@ -376,7 +375,7 @@ class TestPGPMessage(object):
def test_encrypt_insecure_cipher(self): def test_encrypt_insecure_cipher(self):
msg = PGPMessage.new('asdf') msg = PGPMessage.new('asdf')
with pytest.raises(PGPInsecureCipher): with pytest.raises(PGPInsecureCipherError):
msg.encrypt('QwertyUiop', cipher=SymmetricKeyAlgorithm.IDEA) msg.encrypt('QwertyUiop', cipher=SymmetricKeyAlgorithm.IDEA)
def test_encrypt_sessionkey_wrongtype(self): def test_encrypt_sessionkey_wrongtype(self):

2
tox.ini
View File

@@ -11,7 +11,7 @@ markers =
[flake8] [flake8]
exclude = .git,.idea,__pycache__,.tox,tests/*,docs/*,test_load_asc_bench.py exclude = .git,.idea,__pycache__,.tox,tests/*,docs/*,test_load_asc_bench.py
ignore = E201,E202,E221,E251,E265,F403,F821,N805 ignore = E201,E202,E221,E251,E265,F403,F821,N805,W503
max-line-length = 160 max-line-length = 160
[testenv] [testenv]