Fix lint

qutebrowser/misc/sessions.py

@@ -31,7 +31,6 @@ try:
 except ImportError:  # pragma: no cover
     from yaml import SafeLoader as YamlLoader, SafeDumper as YamlDumper
 
-from qutebrowser.browser.webkit import tabhistory
 from qutebrowser.utils import (standarddir, objreg, qtutils, log, usertypes,
                                message, utils)
 from qutebrowser.commands import cmdexc, cmdutils

tests/end2end/features/test_marks_bdd.py

@@ -17,7 +17,6 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
 
-import pytest
 import pytest_bdd as bdd
 bdd.scenarios('marks.feature')
 

tests/end2end/features/test_sessions_bdd.py

@@ -20,7 +20,6 @@
 import os.path
 import logging
 
-import pytest
 import pytest_bdd as bdd
 bdd.scenarios('sessions.feature')
 

tests/end2end/fixtures/quteprocess.py

@@ -183,23 +183,8 @@ class QuteProc(testprocess.Process):
         if self._load_ready and self._focus_ready:
             self.ready.emit()
 
-    def _parse_line(self, line):
+    def _process_line(self, log_line):
-        try:
+        """Check if the line matches any initial lines we're interested in."""
-            log_line = LogLine(line)
-        except testprocess.InvalidLine:
-            if not line.strip():
-                return None
-            elif 'Running without the SUID sandbox!' in line:
-                # QtWebEngine error
-                return None
-            elif is_ignored_qt_message(line):
-                return None
-            else:
-                raise
-
-        log_line.use_color = self.request.config.getoption('--color') != 'no'
-        self._log(log_line)
-
         start_okay_message_load = (
             "load status for <qutebrowser.browser.* tab_id=0 "
             "url='about:blank'>: LoadStatus.success")
@@ -236,6 +221,23 @@ class QuteProc(testprocess.Process):
         elif self._is_error_logline(log_line):
             self.got_error.emit()
 
+    def _parse_line(self, line):
+        try:
+            log_line = LogLine(line)
+        except testprocess.InvalidLine:
+            if not line.strip():
+                return None
+            elif 'Running without the SUID sandbox!' in line:
+                # QtWebEngine error
+                return None
+            elif is_ignored_qt_message(line):
+                return None
+            else:
+                raise
+
+        log_line.use_color = self.request.config.getoption('--color') != 'no'
+        self._log(log_line)
+        self._process_line(log_line)
         return log_line
 
     def _executable_args(self):

tests/end2end/fixtures/testprocess.py

@@ -349,7 +349,7 @@ class Process(QObject):
                 # this line again.
                 line.waited_for = True
                 self._log("\n----> Already found {!r} in the log: {}".format(
-                        kwargs.get('message', 'line'), line))
+                    kwargs.get('message', 'line'), line))
                 return line
         return None
 

tests/unit/misc/test_sessions.py

@@ -19,8 +19,6 @@
 
 """Tests for qutebrowser.misc.sessions."""
 
-import os
-import textwrap
 import logging
 
 import pytest
@@ -32,7 +30,6 @@ from qutebrowser.misc import sessions
 from qutebrowser.misc.sessions import TabHistoryItem as Item
 from qutebrowser.utils import objreg, qtutils
 from qutebrowser.browser.webkit import tabhistory
-from qutebrowser.commands import cmdexc
 
 
 pytestmark = pytest.mark.qt_log_ignore('QIODevice::read.*: device not open')