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

Merge branch 'ss/remove-uneeded-includes' into next

Browse Source
This commit is contained in:
Nicolas Sebrecht 2010-12-13 21:20:22 +01:00
commit 40dcab7134
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
offlineimap/init.py
View File

@ -17,13 +17,12 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
import imaplib import imaplib
from offlineimap import imapserver, repository, folder, mbnames, threadutil, version, syncmaster, accounts from offlineimap import imapserver, threadutil, version, syncmaster, accounts
from offlineimap.localeval import LocalEval from offlineimap.localeval import LocalEval
from offlineimap.threadutil import InstanceLimitedThread, ExitNotifyThread from offlineimap.threadutil import InstanceLimitedThread, ExitNotifyThread
from offlineimap.ui import UIBase import offlineimap.ui
import re, os, os.path, offlineimap, sys import os, sys
from offlineimap.CustomConfig import CustomConfigParser from offlineimap.CustomConfig import CustomConfigParser
from threading import *
import threading, socket import threading, socket
from getopt import getopt from getopt import getopt
import signal import signal
@ -97,7 +96,7 @@ class OfflineImap:
config.set(section, key, value) config.set(section, key, value)
ui = offlineimap.ui.detector.findUI(config, options.get('-u')) ui = offlineimap.ui.detector.findUI(config, options.get('-u'))
UIBase.setglobalui(ui) offlineimap.ui.UIBase.setglobalui(ui)
if options.has_key('-l'): if options.has_key('-l'):
ui.setlogfd(open(options['-l'], 'wt')) ui.setlogfd(open(options['-l'], 'wt'))
@ -140,7 +139,9 @@ class OfflineImap:
def sigterm_handler(self, signum, frame): def sigterm_handler(self, signum, frame):
# die immediately # die immediately
ui = BaseUI.getglobalui()
ui.terminate(errormsg="terminating...") ui.terminate(errormsg="terminating...")
signal.signal(signal.SIGTERM,sigterm_handler) signal.signal(signal.SIGTERM,sigterm_handler)
try: try:
@ -231,6 +232,6 @@ class OfflineImap:
except SystemExit: except SystemExit:
raise raise
except: except:
ui.mainException() # Also expected to terminate. ui.mainException() # Also expected to terminate.