/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2015-05-31 16:13:39 UTC
  • Revision ID: teddy@recompile.se-20150531161339-igb3l0ip3c10ejpz
mandos-ctl: Generate better messages in exceptions.

mandos (rfc3339_duration_to_delta): Remove dead code.  Adjust white
                                    space.
mandos-ctl (rfc3339_duration_to_delta): Do minor formatting and
                                        whitespace adjustments, and
                                        Generate better message in
                                        exception.
(string_to_delta): Adjust quote character in doc string.

Show diffs side-by-side

added added

removed removed

Lines of Context:
3
3
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
5
6
 
# Copyright © 2009-2012 Teddy Hogeborn
7
 
# Copyright © 2009-2012 Björn Påhlsson
 
6
# Copyright © 2009-2014 Teddy Hogeborn
 
7
# Copyright © 2009-2014 Björn Påhlsson
8
8
9
9
# This program is free software: you can redistribute it and/or modify
10
10
# it under the terms of the GNU General Public License as published by
17
17
#     GNU General Public License for more details.
18
18
19
19
# You should have received a copy of the GNU General Public License
20
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
20
# along with this program.  If not, see
 
21
# <http://www.gnu.org/licenses/>.
21
22
22
23
# Contact the authors at <mandos@recompile.se>.
23
24
24
25
 
25
26
from __future__ import (division, absolute_import, print_function,
26
27
                        unicode_literals)
 
28
try:
 
29
    from future_builtins import *
 
30
except ImportError:
 
31
    pass
27
32
 
28
33
import sys
29
34
import os
30
 
import signal
31
35
 
32
36
import datetime
33
37
 
35
39
import urwid
36
40
 
37
41
from dbus.mainloop.glib import DBusGMainLoop
38
 
import gobject
 
42
try:
 
43
    import gobject
 
44
except ImportError:
 
45
    from gi.repository import GObject as gobject
39
46
 
40
47
import dbus
41
48
 
42
 
import UserList
43
 
 
44
49
import locale
45
50
 
 
51
if sys.version_info.major == 2:
 
52
    str = unicode
 
53
 
46
54
locale.setlocale(locale.LC_ALL, '')
47
55
 
48
56
import logging
52
60
domain = 'se.recompile'
53
61
server_interface = domain + '.Mandos'
54
62
client_interface = domain + '.Mandos.Client'
55
 
version = "1.5.3"
56
 
 
57
 
# Always run in monochrome mode
58
 
urwid.curses_display.curses.has_colors = lambda : False
59
 
 
60
 
# Urwid doesn't support blinking, but we want it.  Since we have no
61
 
# use for underline on its own, we make underline also always blink.
62
 
urwid.curses_display.curses.A_UNDERLINE |= (
63
 
    urwid.curses_display.curses.A_BLINK)
 
63
version = "1.6.9"
64
64
 
65
65
def isoformat_to_datetime(iso):
66
66
    "Parse an ISO 8601 date string to a datetime.datetime()"
83
83
    properties and calls a hook function when any of them are
84
84
    changed.
85
85
    """
86
 
    def __init__(self, proxy_object=None, *args, **kwargs):
 
86
    def __init__(self, proxy_object=None, properties=None, **kwargs):
87
87
        self.proxy = proxy_object # Mandos Client proxy object
88
 
        
89
 
        self.properties = dict()
 
88
        self.properties = dict() if properties is None else properties
90
89
        self.property_changed_match = (
91
 
            self.proxy.connect_to_signal("PropertyChanged",
92
 
                                         self.property_changed,
93
 
                                         client_interface,
 
90
            self.proxy.connect_to_signal("PropertiesChanged",
 
91
                                         self.properties_changed,
 
92
                                         dbus.PROPERTIES_IFACE,
94
93
                                         byte_arrays=True))
95
94
        
96
 
        self.properties.update(
97
 
            self.proxy.GetAll(client_interface,
98
 
                              dbus_interface = dbus.PROPERTIES_IFACE))
99
 
 
100
 
        #XXX This breaks good super behaviour
101
 
#        super(MandosClientPropertyCache, self).__init__(
102
 
#            *args, **kwargs)
 
95
        if properties is None:
 
96
            self.properties.update(
 
97
                self.proxy.GetAll(client_interface,
 
98
                                  dbus_interface
 
99
                                  = dbus.PROPERTIES_IFACE))
 
100
        
 
101
        super(MandosClientPropertyCache, self).__init__(**kwargs)
103
102
    
104
 
    def property_changed(self, property=None, value=None):
105
 
        """This is called whenever we get a PropertyChanged signal
106
 
        It updates the changed property in the "properties" dict.
 
103
    def properties_changed(self, interface, properties, invalidated):
 
104
        """This is called whenever we get a PropertiesChanged signal
 
105
        It updates the changed properties in the "properties" dict.
107
106
        """
108
107
        # Update properties dict with new value
109
 
        self.properties[property] = value
 
108
        self.properties.update(properties)
110
109
    
111
 
    def delete(self, *args, **kwargs):
 
110
    def delete(self):
112
111
        self.property_changed_match.remove()
113
 
        super(MandosClientPropertyCache, self).__init__(
114
 
            *args, **kwargs)
115
112
 
116
113
 
117
114
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
119
116
    """
120
117
    
121
118
    def __init__(self, server_proxy_object=None, update_hook=None,
122
 
                 delete_hook=None, logger=None, *args, **kwargs):
 
119
                 delete_hook=None, logger=None, **kwargs):
123
120
        # Called on update
124
121
        self.update_hook = update_hook
125
122
        # Called on delete
130
127
        self.logger = logger
131
128
        
132
129
        self._update_timer_callback_tag = None
133
 
        self._update_timer_callback_lock = 0
134
130
        
135
131
        # The widget shown normally
136
132
        self._text_widget = urwid.Text("")
137
133
        # The widget shown when we have focus
138
134
        self._focus_text_widget = urwid.Text("")
139
 
        super(MandosClientWidget, self).__init__(
140
 
            update_hook=update_hook, delete_hook=delete_hook,
141
 
            *args, **kwargs)
 
135
        super(MandosClientWidget, self).__init__(**kwargs)
142
136
        self.update()
143
137
        self.opened = False
144
138
        
145
 
        last_checked_ok = isoformat_to_datetime(self.properties
146
 
                                                ["LastCheckedOK"])
147
 
        
148
 
        if self.properties ["LastCheckerStatus"] != 0:
149
 
            self.using_timer(True)
150
 
        
151
 
        if self.need_approval:
152
 
            self.using_timer(True)
153
 
        
154
139
        self.match_objects = (
155
140
            self.proxy.connect_to_signal("CheckerCompleted",
156
141
                                         self.checker_completed,
172
157
                                         self.rejected,
173
158
                                         client_interface,
174
159
                                         byte_arrays=True))
175
 
        #self.logger('Created client {0}'
176
 
        #            .format(self.properties["Name"]))
177
 
    
178
 
    def property_changed(self, property=None, value=None):
179
 
        super(self, MandosClientWidget).property_changed(property,
180
 
                                                         value)
181
 
        if property == "ApprovalPending":
182
 
            using_timer(bool(value))
183
 
        if property == "LastCheckerStatus":
184
 
            using_timer(value != 0)
185
 
            #self.logger('Checker for client {0} (command "{1}") was '
186
 
            #            ' successful'.format(self.properties["Name"],
187
 
            #                                 command))
 
160
        self.logger('Created client {}'
 
161
                    .format(self.properties["Name"]), level=0)
188
162
    
189
163
    def using_timer(self, flag):
190
164
        """Call this method with True or False when timer should be
191
165
        activated or deactivated.
192
166
        """
193
 
        old = self._update_timer_callback_lock
194
 
        if flag:
195
 
            self._update_timer_callback_lock += 1
196
 
        else:
197
 
            self._update_timer_callback_lock -= 1
198
 
        if old == 0 and self._update_timer_callback_lock:
 
167
        if flag and self._update_timer_callback_tag is None:
199
168
            # Will update the shown timer value every second
200
169
            self._update_timer_callback_tag = (gobject.timeout_add
201
170
                                               (1000,
202
171
                                                self.update_timer))
203
 
        elif old and self._update_timer_callback_lock == 0:
 
172
        elif not (flag or self._update_timer_callback_tag is None):
204
173
            gobject.source_remove(self._update_timer_callback_tag)
205
174
            self._update_timer_callback_tag = None
206
175
    
207
176
    def checker_completed(self, exitstatus, condition, command):
208
177
        if exitstatus == 0:
 
178
            self.logger('Checker for client {} (command "{}")'
 
179
                        ' succeeded'.format(self.properties["Name"],
 
180
                                            command), level=0)
209
181
            self.update()
210
182
            return
211
183
        # Checker failed
212
184
        if os.WIFEXITED(condition):
213
 
            self.logger('Checker for client {0} (command "{1}")'
214
 
                        ' failed with exit code {2}'
 
185
            self.logger('Checker for client {} (command "{}") failed'
 
186
                        ' with exit code {}'
215
187
                        .format(self.properties["Name"], command,
216
188
                                os.WEXITSTATUS(condition)))
217
189
        elif os.WIFSIGNALED(condition):
218
 
            self.logger('Checker for client {0} (command "{1}") was'
219
 
                        ' killed by signal {2}'
 
190
            self.logger('Checker for client {} (command "{}") was'
 
191
                        ' killed by signal {}'
220
192
                        .format(self.properties["Name"], command,
221
193
                                os.WTERMSIG(condition)))
222
194
        elif os.WCOREDUMP(condition):
223
 
            self.logger('Checker for client {0} (command "{1}")'
224
 
                        ' dumped core'
225
 
                        .format(self.properties["Name"], command))
 
195
            self.logger('Checker for client {} (command "{}") dumped'
 
196
                        ' core'.format(self.properties["Name"],
 
197
                                       command))
226
198
        else:
227
 
            self.logger('Checker for client {0} completed'
 
199
            self.logger('Checker for client {} completed'
228
200
                        ' mysteriously'
229
201
                        .format(self.properties["Name"]))
230
202
        self.update()
231
203
    
232
204
    def checker_started(self, command):
233
 
        """Server signals that a checker started. This could be useful
234
 
           to log in the future. """
235
 
        #self.logger('Client {0} started checker "{1}"'
236
 
        #            .format(self.properties["Name"],
237
 
        #                    unicode(command)))
238
 
        pass
 
205
        """Server signals that a checker started."""
 
206
        self.logger('Client {} started checker "{}"'
 
207
                    .format(self.properties["Name"],
 
208
                            command), level=0)
239
209
    
240
210
    def got_secret(self):
241
 
        self.logger('Client {0} received its secret'
 
211
        self.logger('Client {} received its secret'
242
212
                    .format(self.properties["Name"]))
243
213
    
244
214
    def need_approval(self, timeout, default):
245
215
        if not default:
246
 
            message = 'Client {0} needs approval within {1} seconds'
 
216
            message = 'Client {} needs approval within {} seconds'
247
217
        else:
248
 
            message = 'Client {0} will get its secret in {1} seconds'
 
218
            message = 'Client {} will get its secret in {} seconds'
249
219
        self.logger(message.format(self.properties["Name"],
250
220
                                   timeout/1000))
251
 
        self.using_timer(True)
252
221
    
253
222
    def rejected(self, reason):
254
 
        self.logger('Client {0} was rejected; reason: {1}'
 
223
        self.logger('Client {} was rejected; reason: {}'
255
224
                    .format(self.properties["Name"], reason))
256
225
    
257
226
    def selectable(self):
280
249
                          "bold-underline-blink":
281
250
                              "bold-underline-blink-standout",
282
251
                          }
283
 
 
 
252
        
284
253
        # Rebuild focus and non-focus widgets using current properties
285
 
 
 
254
        
286
255
        # Base part of a client. Name!
287
256
        base = '{name}: '.format(name=self.properties["Name"])
288
257
        if not self.properties["Enabled"]:
289
258
            message = "DISABLED"
 
259
            self.using_timer(False)
290
260
        elif self.properties["ApprovalPending"]:
291
261
            timeout = datetime.timedelta(milliseconds
292
262
                                         = self.properties
294
264
            last_approval_request = isoformat_to_datetime(
295
265
                self.properties["LastApprovalRequest"])
296
266
            if last_approval_request is not None:
297
 
                timer = timeout - (datetime.datetime.utcnow()
298
 
                                   - last_approval_request)
 
267
                timer = max(timeout - (datetime.datetime.utcnow()
 
268
                                       - last_approval_request),
 
269
                            datetime.timedelta())
299
270
            else:
300
271
                timer = datetime.timedelta()
301
272
            if self.properties["ApprovedByDefault"]:
302
 
                message = "Approval in {0}. (d)eny?"
 
273
                message = "Approval in {}. (d)eny?"
303
274
            else:
304
 
                message = "Denial in {0}. (a)pprove?"
305
 
            message = message.format(unicode(timer).rsplit(".", 1)[0])
 
275
                message = "Denial in {}. (a)pprove?"
 
276
            message = message.format(str(timer).rsplit(".", 1)[0])
 
277
            self.using_timer(True)
306
278
        elif self.properties["LastCheckerStatus"] != 0:
307
 
            # When checker has failed, print a timer until client expires
 
279
            # When checker has failed, show timer until client expires
308
280
            expires = self.properties["Expires"]
309
281
            if expires == "":
310
282
                timer = datetime.timedelta(0)
311
283
            else:
312
 
                expires = datetime.datetime.strptime(expires,
313
 
                                                     '%Y-%m-%dT%H:%M:%S.%f')
314
 
                timer = expires - datetime.datetime.utcnow()
 
284
                expires = (datetime.datetime.strptime
 
285
                           (expires, '%Y-%m-%dT%H:%M:%S.%f'))
 
286
                timer = max(expires - datetime.datetime.utcnow(),
 
287
                            datetime.timedelta())
315
288
            message = ('A checker has failed! Time until client'
316
 
                       ' gets disabled: {0}'
317
 
                       .format(unicode(timer).rsplit(".", 1)[0]))
 
289
                       ' gets disabled: {}'
 
290
                       .format(str(timer).rsplit(".", 1)[0]))
 
291
            self.using_timer(True)
318
292
        else:
319
293
            message = "enabled"
320
 
        self._text = "{0}{1}".format(base, message)
321
 
            
 
294
            self.using_timer(False)
 
295
        self._text = "{}{}".format(base, message)
 
296
        
322
297
        if not urwid.supports_unicode():
323
298
            self._text = self._text.encode("ascii", "replace")
324
299
        textlist = [("normal", self._text)]
341
316
        self.update()
342
317
        return True             # Keep calling this
343
318
    
344
 
    def delete(self, *args, **kwargs):
 
319
    def delete(self, **kwargs):
345
320
        if self._update_timer_callback_tag is not None:
346
321
            gobject.source_remove(self._update_timer_callback_tag)
347
322
            self._update_timer_callback_tag = None
350
325
        self.match_objects = ()
351
326
        if self.delete_hook is not None:
352
327
            self.delete_hook(self)
353
 
        return super(MandosClientWidget, self).delete(*args, **kwargs)
 
328
        return super(MandosClientWidget, self).delete(**kwargs)
354
329
    
355
330
    def render(self, maxcolrow, focus=False):
356
331
        """Render differently if we have focus.
398
373
        else:
399
374
            return key
400
375
    
401
 
    def property_changed(self, property=None, value=None,
402
 
                         *args, **kwargs):
403
 
        """Call self.update() if old value is not new value.
 
376
    def properties_changed(self, interface, properties, invalidated):
 
377
        """Call self.update() if any properties changed.
404
378
        This overrides the method from MandosClientPropertyCache"""
405
 
        property_name = unicode(property)
406
 
        old_value = self.properties.get(property_name)
407
 
        super(MandosClientWidget, self).property_changed(
408
 
            property=property, value=value, *args, **kwargs)
409
 
        if self.properties.get(property_name) != old_value:
 
379
        old_values = { key: self.properties.get(key)
 
380
                       for key in properties.keys() }
 
381
        super(MandosClientWidget, self).properties_changed(
 
382
            interface, properties, invalidated)
 
383
        if any(old_values[key] != self.properties.get(key)
 
384
               for key in old_values):
410
385
            self.update()
411
386
 
412
387
 
415
390
    "down" key presses, thus not allowing any containing widgets to
416
391
    use them as an excuse to shift focus away from this widget.
417
392
    """
418
 
    def keypress(self, maxcolrow, key):
419
 
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
 
393
    def keypress(self, *args, **kwargs):
 
394
        ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
420
395
        if ret in ("up", "down"):
421
396
            return
422
397
        return ret
426
401
    """This is the entire user interface - the whole screen
427
402
    with boxes, lists of client widgets, etc.
428
403
    """
429
 
    def __init__(self, max_log_length=1000):
 
404
    def __init__(self, max_log_length=1000, log_level=1):
430
405
        DBusGMainLoop(set_as_default=True)
431
406
        
432
407
        self.screen = urwid.curses_display.Screen()
435
410
                ("normal",
436
411
                 "default", "default", None),
437
412
                ("bold",
438
 
                 "default", "default", "bold"),
 
413
                 "bold", "default", "bold"),
439
414
                ("underline-blink",
440
 
                 "default", "default", "underline"),
 
415
                 "underline,blink", "default", "underline,blink"),
441
416
                ("standout",
442
 
                 "default", "default", "standout"),
 
417
                 "standout", "default", "standout"),
443
418
                ("bold-underline-blink",
444
 
                 "default", "default", ("bold", "underline")),
 
419
                 "bold,underline,blink", "default", "bold,underline,blink"),
445
420
                ("bold-standout",
446
 
                 "default", "default", ("bold", "standout")),
 
421
                 "bold,standout", "default", "bold,standout"),
447
422
                ("underline-blink-standout",
448
 
                 "default", "default", ("underline", "standout")),
 
423
                 "underline,blink,standout", "default",
 
424
                 "underline,blink,standout"),
449
425
                ("bold-underline-blink-standout",
450
 
                 "default", "default", ("bold", "underline",
451
 
                                          "standout")),
 
426
                 "bold,underline,blink,standout", "default",
 
427
                 "bold,underline,blink,standout"),
452
428
                ))
453
429
        
454
430
        if urwid.supports_unicode():
469
445
        self.log = []
470
446
        self.max_log_length = max_log_length
471
447
        
 
448
        self.log_level = log_level
 
449
        
472
450
        # We keep a reference to the log widget so we can remove it
473
451
        # from the ListWalker without it getting destroyed
474
452
        self.logbox = ConstrainedListBox(self.log)
488
466
        self.main_loop = gobject.MainLoop()
489
467
    
490
468
    def client_not_found(self, fingerprint, address):
491
 
        self.log_message("Client with address {0} and fingerprint"
492
 
                         " {1} could not be found"
 
469
        self.log_message("Client with address {} and fingerprint {}"
 
470
                         " could not be found"
493
471
                         .format(address, fingerprint))
494
472
    
495
473
    def rebuild(self):
508
486
            self.uilist.append(self.logbox)
509
487
        self.topwidget = urwid.Pile(self.uilist)
510
488
    
511
 
    def log_message(self, message):
 
489
    def log_message(self, message, level=1):
 
490
        """Log message formatted with timestamp"""
 
491
        if level < self.log_level:
 
492
            return
512
493
        timestamp = datetime.datetime.now().isoformat()
513
 
        self.log_message_raw(timestamp + ": " + message)
 
494
        self.log_message_raw("{}: {}".format(timestamp, message),
 
495
                             level=level)
514
496
    
515
 
    def log_message_raw(self, markup):
 
497
    def log_message_raw(self, markup, level=1):
516
498
        """Add a log message to the log buffer."""
 
499
        if level < self.log_level:
 
500
            return
517
501
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
518
502
        if (self.max_log_length
519
503
            and len(self.log) > self.max_log_length):
526
510
        """Toggle visibility of the log buffer."""
527
511
        self.log_visible = not self.log_visible
528
512
        self.rebuild()
529
 
        #self.log_message("Log visibility changed to: "
530
 
        #                 + unicode(self.log_visible))
 
513
        self.log_message("Log visibility changed to: {}"
 
514
                         .format(self.log_visible), level=0)
531
515
    
532
516
    def change_log_display(self):
533
517
        """Change type of log display.
538
522
            self.log_wrap = "clip"
539
523
        for textwidget in self.log:
540
524
            textwidget.set_wrap_mode(self.log_wrap)
541
 
        #self.log_message("Wrap mode: " + self.log_wrap)
 
525
        self.log_message("Wrap mode: {}".format(self.log_wrap),
 
526
                         level=0)
542
527
    
543
528
    def find_and_remove_client(self, path, name):
544
529
        """Find a client by its object path and remove it.
549
534
            client = self.clients_dict[path]
550
535
        except KeyError:
551
536
            # not found?
552
 
            self.log_message("Unknown client {0!r} ({1!r}) removed"
 
537
            self.log_message("Unknown client {!r} ({!r}) removed"
553
538
                             .format(name, path))
554
539
            return
555
540
        client.delete()
573
558
        if path is None:
574
559
            path = client.proxy.object_path
575
560
        self.clients_dict[path] = client
576
 
        self.clients.sort(None, lambda c: c.properties["Name"])
 
561
        self.clients.sort(key=lambda c: c.properties["Name"])
577
562
        self.refresh()
578
563
    
579
564
    def remove_client(self, client, path=None):
581
566
        if path is None:
582
567
            path = client.proxy.object_path
583
568
        del self.clients_dict[path]
584
 
        if not self.clients_dict:
585
 
            # Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
586
 
            # is completely emptied, we need to recreate it.
587
 
            self.clients = urwid.SimpleListWalker([])
588
 
            self.rebuild()
589
569
        self.refresh()
590
570
    
591
571
    def refresh(self):
604
584
        try:
605
585
            mandos_clients = (self.mandos_serv
606
586
                              .GetAllClientsWithProperties())
 
587
            if not mandos_clients:
 
588
                self.log_message_raw(("bold", "Note: Server has no clients."))
607
589
        except dbus.exceptions.DBusException:
 
590
            self.log_message_raw(("bold", "Note: No Mandos server running."))
608
591
            mandos_clients = dbus.Dictionary()
609
592
        
610
593
        (self.mandos_serv
622
605
                            self.client_not_found,
623
606
                            dbus_interface=server_interface,
624
607
                            byte_arrays=True))
625
 
        for path, client in mandos_clients.iteritems():
 
608
        for path, client in mandos_clients.items():
626
609
            client_proxy_object = self.bus.get_object(self.busname,
627
610
                                                      path)
628
611
            self.add_client(MandosClientWidget(server_proxy_object
637
620
                                               logger
638
621
                                               =self.log_message),
639
622
                            path=path)
640
 
 
 
623
        
641
624
        self.refresh()
642
625
        self._input_callback_tag = (gobject.io_add_watch
643
626
                                    (sys.stdin.fileno(),
675
658
            elif key == "window resize":
676
659
                self.size = self.screen.get_cols_rows()
677
660
                self.refresh()
678
 
            elif key == "\f":  # Ctrl-L
 
661
            elif key == "ctrl l":
 
662
                self.screen.clear()
679
663
                self.refresh()
680
664
            elif key == "l" or key == "D":
681
665
                self.toggle_log_display()
693
677
                                            "?: Help",
694
678
                                            "l: Log window toggle",
695
679
                                            "TAB: Switch window",
696
 
                                            "w: Wrap (log)"))))
 
680
                                            "w: Wrap (log lines)",
 
681
                                            "v: Toggle verbose log",
 
682
                                            ))))
697
683
                self.log_message_raw(("bold",
698
684
                                      "  "
699
685
                                      .join(("Clients:",
712
698
                else:
713
699
                    self.topwidget.set_focus(self.logbox)
714
700
                self.refresh()
 
701
            elif key == "v":
 
702
                if self.log_level == 0:
 
703
                    self.log_level = 1
 
704
                    self.log_message("Verbose mode: Off")
 
705
                else:
 
706
                    self.log_level = 0
 
707
                    self.log_message("Verbose mode: On")
715
708
            #elif (key == "end" or key == "meta >" or key == "G"
716
709
            #      or key == ">"):
717
710
            #    pass            # xxx end-of-buffer
740
733
    ui.run()
741
734
except KeyboardInterrupt:
742
735
    ui.screen.stop()
743
 
except Exception, e:
744
 
    ui.log_message(unicode(e))
 
736
except Exception as e:
 
737
    ui.log_message(str(e))
745
738
    ui.screen.stop()
746
739
    raise