rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'arsana7-master'

Browse Source
This commit is contained in:
Florian Bruhin 2016-02-17 07:10:22 +01:00
commit ae7cbb6dce
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.asciidoc
View File

@ -184,6 +184,7 @@ Contributors, sorted by the number of commits in descending order:
* Link * Link
* Larry Hynes * Larry Hynes
* Johannes Altmanninger * Johannes Altmanninger
* avk
* Samir Benmendil * Samir Benmendil
* Regina Hug * Regina Hug
* Mathias Fussenegger * Mathias Fussenegger

5
qutebrowser/misc/crashdialog.py
View File

@ -26,6 +26,7 @@ import html
import getpass import getpass
import fnmatch import fnmatch
import traceback import traceback
import datetime
import pkg_resources import pkg_resources
from PyQt5.QtCore import pyqtSlot, Qt, QSize, qVersion from PyQt5.QtCore import pyqtSlot, Qt, QSize, qVersion
@ -236,7 +237,9 @@ class _CrashDialog(QDialog):
try: try:
application = QApplication.instance() application = QApplication.instance()
launch_time = application.launch_time.ctime() launch_time = application.launch_time.ctime()
self._crash_info.append(('Launch time', launch_time)) crash_time = datetime.datetime.now().ctime()
text = 'Launch: {}\nCrash: {}'.format(launch_time, crash_time)
self._crash_info.append(('Timestamps', text))
except Exception: except Exception:
self._crash_info.append(("Launch time", traceback.format_exc())) self._crash_info.append(("Launch time", traceback.format_exc()))
try: try:

5
qutebrowser/utils/log.py
View File

@ -51,10 +51,11 @@ else:
colorama.deinit() colorama.deinit()
# Log formats to use. # Log formats to use.
SIMPLE_FMT = '{levelname}: {message}' SIMPLE_FMT = '{asctime:8} {levelname}: {message}'
EXTENDED_FMT = ('{asctime:8} {levelname:8} {name:10} {module}:{funcName}:' EXTENDED_FMT = ('{asctime:8} {levelname:8} {name:10} {module}:{funcName}:'
'{lineno} {message}') '{lineno} {message}')
SIMPLE_FMT_COLORED = '%(log_color)s%(levelname)s%(reset)s: %(message)s' SIMPLE_FMT_COLORED = ('%(green)s%(asctime)-8s%(reset)s '
'%(log_color)s%(levelname)s%(reset)s: %(message)s')
EXTENDED_FMT_COLORED = ( EXTENDED_FMT_COLORED = (
'%(green)s%(asctime)-8s%(reset)s ' '%(green)s%(asctime)-8s%(reset)s '
'%(log_color)s%(levelname)-8s%(reset)s ' '%(log_color)s%(levelname)-8s%(reset)s '