no more Tkinter is not necessary
This commit is contained in:
@@ -1 +1 @@
|
|||||||
Version 2.7.4-stable+timestamp.2013.11.24.09.43.16
|
Version 2.7.4-stable+timestamp.2013.11.24.20.32.35
|
||||||
|
|||||||
+5
-7
@@ -1153,22 +1153,20 @@ def start(cron=True):
|
|||||||
|
|
||||||
root = None
|
root = None
|
||||||
|
|
||||||
if not options.nogui:
|
if not options.nogui and options.password=='<ask>':
|
||||||
try:
|
try:
|
||||||
import Tkinter
|
import Tkinter
|
||||||
havetk = True
|
havetk = True
|
||||||
|
try:
|
||||||
|
root = Tkinter.Tk()
|
||||||
|
except:
|
||||||
|
pass
|
||||||
except (ImportError, OSError):
|
except (ImportError, OSError):
|
||||||
logger.warn(
|
logger.warn(
|
||||||
'GUI not available because Tk library is not installed')
|
'GUI not available because Tk library is not installed')
|
||||||
havetk = False
|
havetk = False
|
||||||
options.nogui = True
|
options.nogui = True
|
||||||
|
|
||||||
if options.password == '<ask>' and havetk or options.taskbar and havetk:
|
|
||||||
try:
|
|
||||||
root = Tkinter.Tk()
|
|
||||||
except:
|
|
||||||
pass
|
|
||||||
|
|
||||||
if root:
|
if root:
|
||||||
root.focus_force()
|
root.focus_force()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user