summaryrefslogtreecommitdiff
path: root/src/mailman/model/autorespond.py
diff options
context:
space:
mode:
authorBarry Warsaw2014-09-22 14:47:02 -0400
committerBarry Warsaw2014-09-22 14:47:02 -0400
commit6b3114c4f0d458db25aa68dc44deeaca5b642ac4 (patch)
tree5ba5344e3186dbc3b0f31da6bf9f23bccb7ace4c /src/mailman/model/autorespond.py
parentf582dbfd193f15aa840228fa4b1c2544ae379a8e (diff)
downloadmailman-6b3114c4f0d458db25aa68dc44deeaca5b642ac4.tar.gz
mailman-6b3114c4f0d458db25aa68dc44deeaca5b642ac4.tar.zst
mailman-6b3114c4f0d458db25aa68dc44deeaca5b642ac4.zip
Diffstat (limited to 'src/mailman/model/autorespond.py')
-rw-r--r--src/mailman/model/autorespond.py19
1 files changed, 9 insertions, 10 deletions
diff --git a/src/mailman/model/autorespond.py b/src/mailman/model/autorespond.py
index c3aff174a..c74434f7b 100644
--- a/src/mailman/model/autorespond.py
+++ b/src/mailman/model/autorespond.py
@@ -26,8 +26,7 @@ __all__ = [
]
-from sqlalchemy import (Column, Integer, String, Unicode,
- ForeignKey, Date)
+from sqlalchemy import Column, Date, ForeignKey, Integer
from sqlalchemy import desc
from sqlalchemy.orm import relationship
from zope.interface import implementer
@@ -55,7 +54,7 @@ class AutoResponseRecord(Model):
mailing_list_id = Column(Integer, ForeignKey('mailinglist.id'))
mailing_list = relationship('MailingList')
- response_type = Column(Enum(enum=Response))
+ response_type = Column(Enum(Response))
date_sent = Column(Date)
def __init__(self, mailing_list, address, response_type):
@@ -77,10 +76,10 @@ class AutoResponseSet:
def todays_count(self, store, address, response_type):
"""See `IAutoResponseSet`."""
return store.query(AutoResponseRecord).filter_by(
- address = address,
- mailing_list = self._mailing_list,
- response_type = response_type,
- date_sent = today()).count()
+ address=address,
+ mailing_list=self._mailing_list,
+ response_type=response_type,
+ date_sent=today()).count()
@dbconnection
def response_sent(self, store, address, response_type):
@@ -93,8 +92,8 @@ class AutoResponseSet:
def last_response(self, store, address, response_type):
"""See `IAutoResponseSet`."""
results = store.query(AutoResponseRecord).filter_by(
- address = address,
- mailing_list = self._mailing_list,
- response_type = response_type
+ address=address,
+ mailing_list=self._mailing_list,
+ response_type=response_type
).order_by(desc(AutoResponseRecord.date_sent))
return (None if results.count() == 0 else results.first())