Skip to content

Fixes problem with incorrect arguments passed to constructors #80 #81

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

Closed
ergo wants to merge 1 commit into from
Closed

Fixes problem with incorrect arguments passed to constructors #80 #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions CONTRIBUTORS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,3 +140,5 @@ Contributors
- Ingmar Steen, 2015-08-20

- Daniel Kraus, 2015-08-27

- Marcin Lulek, 2016-12-07
6 changes: 3 additions & 3 deletions pyramid_mailer/mailer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,16 +223,16 @@ def __init__(self, **kw):
'invalid options: %s' % ', '.join(sorted(kw.keys())))

self.direct_delivery = DirectMailDelivery(
self.smtp_mailer, transaction_manager=transaction_manager)
self.smtp_mailer)

if self.queue_path:
self.queue_delivery = QueuedMailDelivery(
self.queue_path, transaction_manager=transaction_manager)
self.queue_path)
else:
self.queue_delivery = None

self.sendmail_delivery = DirectMailDelivery(
self.sendmail_mailer, transaction_manager=transaction_manager)
self.sendmail_mailer)

@classmethod
def from_settings(cls, settings, prefix='mail.'):
Expand Down