DandelionNStuff/dkimpy-smtputf8
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wrong format spec typo.

Browse Source
This commit is contained in:
Stuart D. Gathman
2012-02-24 22:35:57 -05:00
parent 9f9358f30f
commit 6c54e9040c
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dkim/__init__.py
+7 -5
View File
@@ -161,7 +161,7 @@ def validate_signature_fields(sig):
not sig[b'i'].endswith(sig[b'd']) or not sig[b'i'].endswith(sig[b'd']) or
sig[b'i'][-len(sig[b'd'])-1] not in ('@', '.', 64, 46)): sig[b'i'][-len(sig[b'd'])-1] not in ('@', '.', 64, 46)):
raise ValidationError( raise ValidationError(
"i= domain is not a subdomain of d= (i=%s d=%d)" % "i= domain is not a subdomain of d= (i=%s d=%s)" %
(sig[b'i'], sig[b'd'])) (sig[b'i'], sig[b'd']))
if b'l' in sig and re.match(br"\d{,76}$", sig['l']) is None: if b'l' in sig and re.match(br"\d{,76}$", sig['l']) is None:
raise ValidationError( raise ValidationError(
@@ -304,8 +304,6 @@ class DKIM(object):
self.should_not_sign = set(DKIM.SHOULD_NOT) self.should_not_sign = set(DKIM.SHOULD_NOT)
#: Header fields to sign an extra time to prevent additions. #: Header fields to sign an extra time to prevent additions.
self.frozen_sign = set(DKIM.FROZEN) self.frozen_sign = set(DKIM.FROZEN)
#: Signature parameters of last sign or verify
self.signature_fields = {}
def add_frozen(self,s): def add_frozen(self,s):
""" Add headers not in should_not_sign to frozen_sign. """ Add headers not in should_not_sign to frozen_sign.
@@ -329,10 +327,14 @@ class DKIM(object):
self.headers, self.body = rfc822_parse(message) self.headers, self.body = rfc822_parse(message)
else: else:
self.headers, self.body = [],'' self.headers, self.body = [],''
#: The DKIM signing domain last signed or verified #: The DKIM signing domain last signed or verified.
self.domain = None self.domain = None
#: The DKIM key selector last signed or verified #: The DKIM key selector last signed or verified.
self.selector = 'default' self.selector = 'default'
#: Signature parameters of last sign or verify. To parse
#: a DKIM-Signature header field that you have in hand,
#: use L{dkim.util.parse_tag_value}.
self.signature_fields = {}
#: The list of headers last signed or verified. Each header #: The list of headers last signed or verified. Each header
#: is a name,value tuple. FIXME: The headers are canonicalized. #: is a name,value tuple. FIXME: The headers are canonicalized.
#: This could be more useful as original headers. #: This could be more useful as original headers.