Skip to content

long queue ids can be longer #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tjspinks wants to merge 2 commits into
base: master
Choose a base branch
from
Open

long queue ids can be longer #26

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c23c0c2
long queue ids can be longer
tjspinks Apr 9, 2018
7cd3b58
Merge pull request #1 from tjspinks/tjspinks-patch-1
tjspinks Apr 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pymailq/store.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,11 +339,11 @@ class PostqueueStore(object):
provided by :func:`re.compile` method to match postfix IDs.
Recognized IDs are either:
- hexadecimals, 8 to 12 chars length (regular queue IDs)
- encoded in a 52-character alphabet, 11 to 16 chars length
- encoded in a 52-character alphabet, minimum 11 chars length
(long queue IDs)
They can be followed with ``*`` or ``!``.
Default used regular expression is:
``r"^([A-F0-9]{8,12}|[B-Zb-z0-9]{11,16})[*!]?$"``.
``r"^([A-F0-9]{8,12}|[B-Zb-z0-9]{11,})[*!]?$"``.

.. attribute:: mail_addr_re

Expand Down Expand Up @@ -372,7 +372,7 @@ class PostqueueStore(object):
postqueue_cmd = None
spool_path = None
postqueue_mailstatus = ['active', 'deferred', 'hold']
mail_id_re = re.compile(r"^([A-F0-9]{8,12}|[B-Zb-z0-9]{11,16})[*!]?$")
mail_id_re = re.compile(r"^([A-F0-9]{8,12}|[B-Zb-z0-9]{11,})[*!]?$")
mail_addr_re = re.compile(r"^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]+$")
MailClass = Mail

Expand Down