tobias/docker-offlineimap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ss/deprecate-current-ui-names' into next

Browse Source
This commit is contained in:
Nicolas Sebrecht
2011-03-06 18:33:29 +01:00
parent fc03475b9e 4e28c7c93f
commit 976c071dd7
5 changed files with 50 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
offlineimap/init.py
View File

@ -187,12 +187,18 @@ class OfflineImap:
section = "general"
config.set(section, key, value)
#init the ui, cmd line option overrides config file
ui_type = config.getdefault('general','ui', 'TTY.TTYUI')
#which ui to use? cmd line option overrides config file
ui_type = config.getdefault('general','ui', 'ttyui')
if options.interface != None:
ui_type = options.interface
if '.' in ui_type:
#transform Curses.Blinkenlights -> Blinkenlights
ui_type = ui_type.split('.')[-1]
logging.warning('Using old interface name, consider using one '
'of %s' % ', '.join(UI_LIST.keys()))
try:
ui = UI_LIST[ui_type](config)
# create the ui class
ui = UI_LIST[ui_type.lower()](config)
except KeyError:
logging.error("UI '%s' does not exist, choose one of: %s" % \
(ui_type,', '.join(UI_LIST.keys())))

10
offlineimap/ui/__init__.py
View File

@ -18,14 +18,14 @@
from offlineimap.ui.UIBase import getglobalui, setglobalui
from offlineimap.ui import TTY, Noninteractive, Machine
UI_LIST = {'TTY.TTYUI': TTY.TTYUI,
'Noninteractive.Basic': Noninteractive.Basic,
'Noninteractive.Quiet': Noninteractive.Quiet,
'Machine.MachineUI': Machine.MachineUI}
UI_LIST = {'ttyui': TTY.TTYUI,
'basic': Noninteractive.Basic,
'quiet': Noninteractive.Quiet,
'machineui': Machine.MachineUI}
#add Blinkenlights UI if it imports correctly (curses installed)
try:
from offlineimap.ui import Curses
UI_LIST['Curses.Blinkenlights'] = Curses.Blinkenlights
UI_LIST['blinkenlights'] = Curses.Blinkenlights
except ImportError:
pass