diff options
| author | Sascha Silbe <sascha-pgp@silbe.org> | 2010-10-17 09:36:09 (GMT) |
|---|---|---|
| committer | Sascha Silbe <sascha-pgp@silbe.org> | 2010-11-30 10:37:10 (GMT) |
| commit | 923a7fce4e1d3e9038ea5917275df1eb191966d9 (patch) | |
| tree | 254a38858ba087851fc43cf5454b04be4ab5cd7d /src/jarabe/journal/expandedentry.py | |
| parent | 79c85ed25efaa6eed02589467fa96145795c1205 (diff) | |
Journal details view: don't choke on invalid timestamp (SL#1590, SL#2208)
Metadata can get corrupted by crashes or malformed by buggy activities.
We should do our best to display the parts that are usable.
Acked-by: Simon Schampijer <simon@schampijer.de>
Diffstat (limited to 'src/jarabe/journal/expandedentry.py')
| -rw-r--r-- | src/jarabe/journal/expandedentry.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/jarabe/journal/expandedentry.py b/src/jarabe/journal/expandedentry.py index 0c60600..fe2f320 100644 --- a/src/jarabe/journal/expandedentry.py +++ b/src/jarabe/journal/expandedentry.py @@ -281,10 +281,15 @@ class ExpandedEntry(hippo.CanvasBox): def _format_date(self): if 'timestamp' in self._metadata: - timestamp = float(self._metadata['timestamp']) - return time.strftime('%x', time.localtime(timestamp)) - else: - return _('No date') + try: + timestamp = float(self._metadata['timestamp']) + except (ValueError, TypeError): + logging.warning('Invalid timestamp for %r: %r', + self._metadata['uid'], + self._metadata['timestamp']) + else: + return time.strftime('%x', time.localtime(timestamp)) + return _('No date') def _create_buddy_list(self): |