From 860ef75abcef45d72e730d1f0dab3227aa468165 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 28 Jul 2014 21:09:49 +0200
Subject: [PATCH] Fix lint

---
 qutebrowser/browser/commands.py     | 3 +--
 qutebrowser/test/utils/test_misc.py | 1 -
 qutebrowser/utils/checkpyver.py     | 1 +
 qutebrowser/utils/misc.py           | 1 -
 scripts/generate_doc.py             | 4 ++--
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index afd357de2..eb5e406bd 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -37,8 +37,7 @@ import qutebrowser.utils.webelem as webelem
 import qutebrowser.browser.quickmarks as quickmarks
 import qutebrowser.utils.log as log
 import qutebrowser.utils.url as urlutils
-from qutebrowser.utils.qt import (check_overflow, check_print_compat,
-                                  qt_ensure_valid)
+from qutebrowser.utils.qt import check_overflow, check_print_compat
 from qutebrowser.utils.editor import ExternalEditor
 from qutebrowser.commands.exceptions import CommandError
 from qutebrowser.commands.userscripts import UserscriptRunner
diff --git a/qutebrowser/test/utils/test_misc.py b/qutebrowser/test/utils/test_misc.py
index 2d3ee8d93..afed77fec 100644
--- a/qutebrowser/test/utils/test_misc.py
+++ b/qutebrowser/test/utils/test_misc.py
@@ -24,7 +24,6 @@ import sys
 import shutil
 import unittest
 import os.path
-import subprocess
 from tempfile import mkdtemp
 
 from PyQt5.QtCore import QStandardPaths, QCoreApplication, Qt
diff --git a/qutebrowser/utils/checkpyver.py b/qutebrowser/utils/checkpyver.py
index ae4622c06..5bb41dd1a 100644
--- a/qutebrowser/utils/checkpyver.py
+++ b/qutebrowser/utils/checkpyver.py
@@ -28,6 +28,7 @@ try:
 except ImportError:
     try:
         # Python2
+        # pylint: disable=import-error
         from Tkinter import Tk
         import tkMessageBox as messagebox
     except ImportError:
diff --git a/qutebrowser/utils/misc.py b/qutebrowser/utils/misc.py
index 27b19fade..d749cb266 100644
--- a/qutebrowser/utils/misc.py
+++ b/qutebrowser/utils/misc.py
@@ -20,7 +20,6 @@
 """Other utilities which don't fit anywhere else. """
 
 import os
-import re
 import sys
 import shlex
 import os.path
diff --git a/scripts/generate_doc.py b/scripts/generate_doc.py
index 244c1f8e7..612649029 100644
--- a/scripts/generate_doc.py
+++ b/scripts/generate_doc.py
@@ -54,8 +54,8 @@ def _parse_docstring(func):  # noqa
         A (short_desc, long_desc, arg_descs) tuple.
     """
     # pylint: disable=too-many-branches
-    State = enum('State', 'short', 'desc', 'desc_hidden', 'arg_start',
-                 'arg_inside', 'misc')
+    State = enum('State', 'short', 'desc',  # pylint: disable=invalid-name
+                 'desc_hidden', 'arg_start', 'arg_inside', 'misc')
     doc = inspect.getdoc(func)
     lines = doc.splitlines()