diff options
-rw-r--r-- | alot/commands/thread.py | 2 | ||||
-rw-r--r-- | alot/db/message.py | 2 | ||||
-rw-r--r-- | alot/mail/attachment.py (renamed from alot/db/attachment.py) | 0 | ||||
-rw-r--r-- | alot/mail/envelope.py | 13 | ||||
-rw-r--r-- | alot/widgets/globals.py | 2 |
5 files changed, 9 insertions, 10 deletions
diff --git a/alot/commands/thread.py b/alot/commands/thread.py index e4334a28..72c607b1 100644 --- a/alot/commands/thread.py +++ b/alot/commands/thread.py @@ -27,8 +27,8 @@ from .common import RetagPromptCommand from .envelope import SendCommand from ..completion.contacts import ContactsCompleter from ..completion.path import PathCompleter +from ..mail.attachment import Attachment from ..mail.envelope import Envelope -from ..db.attachment import Attachment from ..db.errors import DatabaseROError from ..settings.const import settings from ..helper import formataddr diff --git a/alot/db/message.py b/alot/db/message.py index 5db42c0a..29ca11dc 100644 --- a/alot/db/message.py +++ b/alot/db/message.py @@ -13,7 +13,7 @@ from datetime import datetime from urwid.util import detected_encoding -from .attachment import Attachment +from ..mail.attachment import Attachment from .. import crypto from .. import helper from ..errors import GPGProblem diff --git a/alot/db/attachment.py b/alot/mail/attachment.py index 5c993a68..5c993a68 100644 --- a/alot/db/attachment.py +++ b/alot/mail/attachment.py diff --git a/alot/mail/envelope.py b/alot/mail/envelope.py index 540c0342..db907340 100644 --- a/alot/mail/envelope.py +++ b/alot/mail/envelope.py @@ -14,7 +14,7 @@ from urllib.parse import unquote import gpg import magic -from ..db.attachment import Attachment +from .attachment import Attachment from .. import __version__ from .. import helper from .. import crypto @@ -99,7 +99,7 @@ class Envelope: tmpfile = None """template text for initial content""" attachments = None - """list of :class:`Attachments <alot.db.attachment.Attachment>`""" + """list of :class:`Attachments <alot.mail.attachment.Attachment>`""" tags = None """tags to add after successful sendout""" account = None @@ -119,7 +119,7 @@ class Envelope: :param headers: unencoded header values :type headers: dict (str -> [unicode]) :param attachments: file attachments to include - :type attachments: list of :class:`~alot.db.attachment.Attachment` + :type attachments: list of :class:`~alot.mail.attachment.Attachment` :param tags: tags to add after successful sendout and saving this msg :type tags: set of str :param replied: message being replied to @@ -231,11 +231,10 @@ class Envelope: def attach(self, attachment): """ - attach a file + attach data - :param attachment: File to attach, given as - :class:`~alot.db.attachment.Attachment` object - :type attachment: :class:`~alot.db.attachment.Attachment` + :param attachment: data to attach + :type attachment: :class:`~alot.mail.attachment.Attachment` """ self.attachments.append(attachment) if self.sent_time: diff --git a/alot/widgets/globals.py b/alot/widgets/globals.py index 7f2a9dcd..66e51406 100644 --- a/alot/widgets/globals.py +++ b/alot/widgets/globals.py @@ -15,7 +15,7 @@ from ..errors import CompletionError class AttachmentWidget(urwid.WidgetWrap): """ - one-line summary of an :class:`~alot.db.attachment.Attachment`. + one-line summary of an :class:`~alot.mail.attachment.Attachment`. """ def __init__(self, attachment, selectable=True): |