diff options
| -rw-r--r-- | alot/buffer.py | 2 | ||||
| -rw-r--r-- | alot/completion.py | 2 | ||||
| -rwxr-xr-x | alot/init.py | 8 | ||||
| -rw-r--r-- | alot/ui.py | 6 |
4 files changed, 10 insertions, 8 deletions
diff --git a/alot/buffer.py b/alot/buffer.py index b313c231..68680e8c 100644 --- a/alot/buffer.py +++ b/alot/buffer.py @@ -22,7 +22,7 @@ from notmuch.globals import NotmuchError import widgets import settings -import command +import commands from walker import IteratorWalker from message import decode_header diff --git a/alot/completion.py b/alot/completion.py index b5d75119..5cb0821a 100644 --- a/alot/completion.py +++ b/alot/completion.py @@ -22,7 +22,7 @@ import os import glob import logging -import command +import commands class Completer(object): diff --git a/alot/init.py b/alot/init.py index 5b479d35..86f3dc42 100755 --- a/alot/init.py +++ b/alot/init.py @@ -25,7 +25,8 @@ import settings from account import AccountManager from db import DBManager from ui import UI -from command import interpret_commandline +import commands +from commands import * def parse_args(): @@ -91,6 +92,7 @@ def main(): logging.basicConfig(level=numeric_loglevel, filename=logfilename) logger = logging.getLogger() + logger.debug(commands.COMMANDS) #accountman aman = AccountManager(settings.config) @@ -99,12 +101,12 @@ def main(): # get initial searchstring if args.command != '': - cmd = interpret_commandline(args.command, 'global') + cmd = commands.interpret_commandline(args.command, 'global') if cmd is None: sys.exit('Invalid command: ' + args.command) else: default_commandline = settings.config.get('general', 'initial_command') - cmd = interpret_commandline(default_commandline, 'global') + cmd = commands.interpret_commandline(default_commandline, 'global') # set up and start interface UI(dbman, @@ -21,9 +21,9 @@ from twisted.internet import reactor, defer from settings import config from buffer import BufferlistBuffer -import command -from command import commandfactory -from command import interpret_commandline +import commands +from commands import commandfactory +from commands import interpret_commandline import widgets from completion import CommandLineCompleter |