diff options
| -rw-r--r-- | alot/__main__.py | 2 | ||||
| -rw-r--r-- | alot/account.py | 2 | ||||
| -rw-r--r-- | alot/commands/envelope.py | 2 | ||||
| -rw-r--r-- | alot/commands/search.py | 2 | ||||
| -rw-r--r-- | alot/commands/thread.py | 4 | ||||
| -rw-r--r-- | alot/completion.py | 10 | ||||
| -rw-r--r-- | alot/db/manager.py | 4 | ||||
| -rw-r--r-- | alot/db/utils.py | 2 | ||||
| -rw-r--r-- | alot/helper.py | 2 | ||||
| -rw-r--r-- | alot/settings/manager.py | 2 | ||||
| -rw-r--r-- | alot/ui.py | 2 | ||||
| -rw-r--r-- | alot/utils/configobj.py | 2 | ||||
| -rw-r--r-- | alot/walker.py | 2 | ||||
| -rw-r--r-- | alot/widgets/globals.py | 4 |
14 files changed, 21 insertions, 21 deletions
diff --git a/alot/__main__.py b/alot/__main__.py index 9b741641..fc34164f 100644 --- a/alot/__main__.py +++ b/alot/__main__.py @@ -52,7 +52,7 @@ def parser(): action=cargparse.ValidatedStoreAction, validator=cargparse.optional_file_like, help='logfile [default: %(default)s]') - # We will handle the subcommands in a seperate run of argparse as argparse + # We will handle the subcommands in a separate run of argparse as argparse # does not support optional subcommands until now. parser.add_argument('command', nargs=argparse.REMAINDER, help='possible subcommands are {}'.format( diff --git a/alot/account.py b/alot/account.py index d8f114c5..30f0e8da 100644 --- a/alot/account.py +++ b/alot/account.py @@ -172,7 +172,7 @@ class Account(object): :param mail: the mail to send :type mail: :class:`email.message.Message` or string :returns: a `Deferred` that errs back with a class:`SendingMailFailed`, - containing a reason string if an error occured. + containing a reason string if an error occurred. """ pass diff --git a/alot/commands/envelope.py b/alot/commands/envelope.py index 4d2963ee..9681a020 100644 --- a/alot/commands/envelope.py +++ b/alot/commands/envelope.py @@ -202,7 +202,7 @@ class SendCommand(Command): # receive a message that they cannot read! if self.envelope.headers.get('Bcc') and self.envelope.encrypt: warning = textwrap.dedent("""\ - Any BCC recepients will not be able to decrypt this + Any BCC recipients will not be able to decrypt this message. Do you want to send anyway?""").replace('\n', ' ') if (yield ui.choice(warning, cancel='no', msg_position='left')) == 'no': diff --git a/alot/commands/search.py b/alot/commands/search.py index 57975841..bf8b9b6b 100644 --- a/alot/commands/search.py +++ b/alot/commands/search.py @@ -172,7 +172,7 @@ class TagCommand(Command): :type action: str :param allmessages: tag all messages in search result :type allmessages: bool - :param flush: imediately write out to the index + :param flush: immediately write out to the index :type flush: bool """ self.tagsstring = tags diff --git a/alot/commands/thread.py b/alot/commands/thread.py index 02017ae9..4c04664f 100644 --- a/alot/commands/thread.py +++ b/alot/commands/thread.py @@ -731,7 +731,7 @@ class PipeCommand(Command): if self.shell: self.cmd = [' '.join(self.cmd)] - # do teh monkey + # do the monkey for mail in pipestrings: if self.background: logging.debug('call in background: %s', self.cmd) @@ -1108,7 +1108,7 @@ class TagCommand(Command): :type action: str :param all: tag all messages in thread :type all: bool - :param flush: imediately write out to the index + :param flush: immediately write out to the index :type flush: bool """ self.tagsstring = tags diff --git a/alot/completion.py b/alot/completion.py index 3d214ca5..78b22d5b 100644 --- a/alot/completion.py +++ b/alot/completion.py @@ -129,7 +129,7 @@ class QueryCompleter(Completer): """completion for a notmuch query string""" def __init__(self, dbman): """ - :param dbman: used to look up avaliable tagstrings + :param dbman: used to look up available tagstrings :type dbman: :class:`~alot.db.DBManager` """ self.dbman = dbman @@ -172,7 +172,7 @@ class TagCompleter(StringlistCompleter): def __init__(self, dbman): """ - :param dbman: used to look up avaliable tagstrings + :param dbman: used to look up available tagstrings :type dbman: :class:`~alot.db.DBManager` """ resultlist = dbman.get_all_tags() @@ -184,7 +184,7 @@ class TagsCompleter(MultipleSelectionCompleter): def __init__(self, dbman): """ - :param dbman: used to look up avaliable tagstrings + :param dbman: used to look up available tagstrings :type dbman: :class:`~alot.db.DBManager` """ self._completer = TagCompleter(dbman) @@ -308,7 +308,7 @@ class CommandCompleter(Completer): def __init__(self, dbman, mode, currentbuffer=None): """ - :param dbman: used to look up avaliable tagstrings + :param dbman: used to look up available tagstrings :type dbman: :class:`~alot.db.DBManager` :param mode: mode identifier :type mode: str @@ -508,7 +508,7 @@ class CommandLineCompleter(Completer): def __init__(self, dbman, mode, currentbuffer=None): """ - :param dbman: used to look up avaliable tagstrings + :param dbman: used to look up available tagstrings :type dbman: :class:`~alot.db.DBManager` :param mode: mode identifier :type mode: str diff --git a/alot/db/manager.py b/alot/db/manager.py index e592da65..d71812d1 100644 --- a/alot/db/manager.py +++ b/alot/db/manager.py @@ -125,7 +125,7 @@ class DBManager(object): cmd, afterwards = current_item[:2] logging.debug('cmd created') - # aquire a writeable db handler + # acquire a writeable db handler try: mode = Database.MODE.READ_WRITE db = Database(path=self.path, mode=mode) @@ -364,7 +364,7 @@ class DBManager(object): os.close(stderr[1]) # closing the sending end in this (receiving) process guarantees - # that here the apropriate EOFError is raised upon .recv in the walker + # that here the appropriate EOFError is raised upon .recv in the walker sender.close() return receiver, process diff --git a/alot/db/utils.py b/alot/db/utils.py index 488e0ed7..2db850ce 100644 --- a/alot/db/utils.py +++ b/alot/db/utils.py @@ -225,7 +225,7 @@ def message_from_file(handle): ''' m = email.message_from_file(handle) - # make sure noone smuggles a token in (data from m is untrusted) + # make sure no one smuggles a token in (data from m is untrusted) del m[X_SIGNATURE_VALID_HEADER] del m[X_SIGNATURE_MESSAGE_HEADER] diff --git a/alot/helper.py b/alot/helper.py index 26787fa8..be5191d8 100644 --- a/alot/helper.py +++ b/alot/helper.py @@ -586,7 +586,7 @@ def RFC3156_canonicalize(text): This function works as follows (in that order): 1. Convert all line endings to \\\\r\\\\n (DOS line endings). - 2. Encode all occurences of "From " at the beginning of a line + 2. Encode all occurrences of "From " at the beginning of a line to "From=20" in order to prevent other mail programs to replace this with "> From" (to avoid MBox conflicts) and thus invalidate the signature. diff --git a/alot/settings/manager.py b/alot/settings/manager.py index 6c9e80fe..cf26f941 100644 --- a/alot/settings/manager.py +++ b/alot/settings/manager.py @@ -434,7 +434,7 @@ class SettingsManager(object): the default account wil be returned :rtype: :class:`Account` :raises ~alot.settings.errors.NoMatchingAccount: If no account can be - found. Thsi includes if return_default is True and there are no + found. This includes if return_default is True and there are no accounts defined. """ _, address = email.utils.parseaddr(address) @@ -262,7 +262,7 @@ class UI(object): """ Called by :class:`urwid.MainLoop` if a keypress was passed to the root widget by `self._input_filter` but is not handled in any widget. We - keep it for debuging purposes. + keep it for debugging purposes. """ logging.debug('unhandled input: %s', key) diff --git a/alot/utils/configobj.py b/alot/utils/configobj.py index d7ce48a4..fa9de2ce 100644 --- a/alot/utils/configobj.py +++ b/alot/utils/configobj.py @@ -118,7 +118,7 @@ def force_list(value, min=None, max=None): a list with one member. You can optionally specify the minimum and maximum number of members. - A minumum of greater than one will fail if the user only supplies a + A minimum of greater than one will fail if the user only supplies a string. The difference to :func:`validate.force_list` is that this test diff --git a/alot/walker.py b/alot/walker.py index 560a0605..2efb9886 100644 --- a/alot/walker.py +++ b/alot/walker.py @@ -11,7 +11,7 @@ class PipeWalker(urwid.ListWalker): """urwid.ListWalker that reads next items from a pipe and wraps them in `containerclass` widgets for displaying - Atributes that should be considered publicly readable: + Attributes that should be considered publicly readable: :attr lines: the lines obtained from the pipe :type lines: list(`containerclass`) """ diff --git a/alot/widgets/globals.py b/alot/widgets/globals.py index 6ce29827..50ef80c6 100644 --- a/alot/widgets/globals.py +++ b/alot/widgets/globals.py @@ -87,7 +87,7 @@ class CompleteEdit(urwid.Edit): The interpretation of some keypresses is hard-wired: :enter: calls 'on_exit' callback with current value :esc/ctrl g: calls 'on_exit' with value `None`, which can be interpreted - as cancelation + as cancellation :tab: calls the completer and tabs forward in the result list :shift tab: tabs backward in the result list :up/down: move in the local input history @@ -278,7 +278,7 @@ class TagWidget(urwid.AttrMap): It looks up the string it displays in the `tags` section of the config as well as custom theme settings for its tag. - Atributes that should be considered publicly readable: + Attributes that should be considered publicly readable: :attr tag: the notmuch tag :type tag: str """ |