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

Fix lint

Browse Source
This commit is contained in:
Florian Bruhin 2017-02-05 19:52:59 +01:00
parent 129c1a0b1a
commit 5e58764326
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
qutebrowser/misc/crashdialog.py
View File

@ -405,17 +405,17 @@ class ExceptionCrashDialog(_CrashDialog):
_pages: A list of lists of the open pages (URLs as strings) _pages: A list of lists of the open pages (URLs as strings)
_cmdhist: A list with the command history (as strings) _cmdhist: A list with the command history (as strings)
_exc: An exception tuple (type, value, traceback) _exc: An exception tuple (type, value, traceback)
_objects: A list of all QObjects as string. _qobjects: A list of all QObjects as string.
""" """
def __init__(self, debug, pages, cmdhist, exc, objects, parent=None): def __init__(self, debug, pages, cmdhist, exc, qobjects, parent=None):
self._chk_log = None self._chk_log = None
self._chk_restore = None self._chk_restore = None
super().__init__(debug, parent) super().__init__(debug, parent)
self._pages = pages self._pages = pages
self._cmdhist = cmdhist self._cmdhist = cmdhist
self._exc = exc self._exc = exc
self._objects = objects self._qobjects = qobjects
self.setModal(True) self.setModal(True)
self._set_crash_info() self._set_crash_info()
@ -462,7 +462,7 @@ class ExceptionCrashDialog(_CrashDialog):
("Commandline args", ' '.join(sys.argv[1:])), ("Commandline args", ' '.join(sys.argv[1:])),
("Open Pages", '\n\n'.join('\n'.join(e) for e in self._pages)), ("Open Pages", '\n\n'.join('\n'.join(e) for e in self._pages)),
("Command history", '\n'.join(self._cmdhist)), ("Command history", '\n'.join(self._cmdhist)),
("Objects", self._objects), ("Objects", self._qobjects),
] ]
try: try:
self._crash_info.append( self._crash_info.append(
@ -550,15 +550,15 @@ class ReportDialog(_CrashDialog):
Attributes: Attributes:
_pages: A list of the open pages (URLs as strings) _pages: A list of the open pages (URLs as strings)
_cmdhist: A list with the command history (as strings) _cmdhist: A list with the command history (as strings)
_objects: A list of all QObjects as string. _qobjects: A list of all QObjects as string.
""" """
def __init__(self, pages, cmdhist, objects, parent=None): def __init__(self, pages, cmdhist, qobjects, parent=None):
super().__init__(False, parent) super().__init__(False, parent)
self.setAttribute(Qt.WA_DeleteOnClose) self.setAttribute(Qt.WA_DeleteOnClose)
self._pages = pages self._pages = pages
self._cmdhist = cmdhist self._cmdhist = cmdhist
self._objects = objects self._qobjects = qobjects
self._set_crash_info() self._set_crash_info()
def _init_text(self): def _init_text(self):
@ -579,7 +579,7 @@ class ReportDialog(_CrashDialog):
("Commandline args", ' '.join(sys.argv[1:])), ("Commandline args", ' '.join(sys.argv[1:])),
("Open Pages", '\n\n'.join('\n'.join(e) for e in self._pages)), ("Open Pages", '\n\n'.join('\n'.join(e) for e in self._pages)),
("Command history", '\n'.join(self._cmdhist)), ("Command history", '\n'.join(self._cmdhist)),
("Objects", self._objects), ("Objects", self._qobjects),
] ]
try: try:
self._crash_info.append(("Debug log", log.ram_handler.dump_log())) self._crash_info.append(("Debug log", log.ram_handler.dump_log()))
@ -615,14 +615,14 @@ class ReportErrorDialog(QDialog):
vbox.addLayout(hbox) vbox.addLayout(hbox)
def dump_exception_info(exc, pages, cmdhist, objects): def dump_exception_info(exc, pages, cmdhist, qobjects):
"""Dump exception info to stderr. """Dump exception info to stderr.
Args: Args:
exc: An exception tuple (type, value, traceback) exc: An exception tuple (type, value, traceback)
pages: A list of lists of the open pages (URLs as strings) pages: A list of lists of the open pages (URLs as strings)
cmdhist: A list with the command history (as strings) cmdhist: A list with the command history (as strings)
objects: A list of all QObjects as string. qobjects: A list of all QObjects as string.
""" """
print(file=sys.stderr) print(file=sys.stderr)
print("\n\n===== Handling exception with --no-err-windows... =====\n\n", print("\n\n===== Handling exception with --no-err-windows... =====\n\n",
@ -647,7 +647,7 @@ def dump_exception_info(exc, pages, cmdhist, objects):
print("\n---- Command history ----", file=sys.stderr) print("\n---- Command history ----", file=sys.stderr)
print('\n'.join(cmdhist), file=sys.stderr) print('\n'.join(cmdhist), file=sys.stderr)
print("\n---- Objects ----", file=sys.stderr) print("\n---- Objects ----", file=sys.stderr)
print(objects, file=sys.stderr) print(qobjects, file=sys.stderr)
print("\n---- Environment ----", file=sys.stderr) print("\n---- Environment ----", file=sys.stderr)
try: try:
print(_get_environment_vars(), file=sys.stderr) print(_get_environment_vars(), file=sys.stderr)

3
tests/end2end/test_insert_mode.py
View File

@ -19,9 +19,6 @@
"""Test insert mode settings on html files.""" """Test insert mode settings on html files."""
import logging
import json
import pytest import pytest