From aa909c0506dc9d4008112f7073edd5129a16d81a Mon Sep 17 00:00:00 2001
From: Martin Tournoij <martin@arp242.net>
Date: Tue, 30 Jun 2015 11:41:47 +0200
Subject: [PATCH] Fix warnings from tox

---
 qutebrowser/browser/network/qutescheme.py | 2 +-
 qutebrowser/mainwindow/tabbedbrowser.py   | 2 +-
 qutebrowser/mainwindow/tabwidget.py       | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/browser/network/qutescheme.py b/qutebrowser/browser/network/qutescheme.py
index 71ee16d5c..7a9f3bf8d 100644
--- a/qutebrowser/browser/network/qutescheme.py
+++ b/qutebrowser/browser/network/qutescheme.py
@@ -153,7 +153,7 @@ def qute_help(win_id, request):
     """Handler for qute:help. Return HTML content as bytes."""
     try:
         utils.read_file('html/doc/index.html')
-    except (FileNotFoundError, NotADirectoryError, OSError, BlockingIOError):
+    except FileNotFoundError:
         html = jinja.env.get_template('error.html').render(
             title="Error while loading documentation",
             url=request.url().toDisplayString(),
diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index 0dcf873df..74006bbbc 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -23,7 +23,7 @@ import functools
 import collections
 
 from PyQt5.QtWidgets import QSizePolicy
-from PyQt5.QtCore import pyqtSignal, pyqtSlot, QSize, QTimer, QUrl
+from PyQt5.QtCore import pyqtSignal, pyqtSlot, QTimer, QUrl
 from PyQt5.QtGui import QIcon
 
 from qutebrowser.config import config
diff --git a/qutebrowser/mainwindow/tabwidget.py b/qutebrowser/mainwindow/tabwidget.py
index 25c870f9a..210281a2b 100644
--- a/qutebrowser/mainwindow/tabwidget.py
+++ b/qutebrowser/mainwindow/tabwidget.py
@@ -24,7 +24,8 @@ Module attributes:
                       between items.
 """
 
-import functools, math
+import functools
+import math
 
 from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QSize, QRect, QPoint, QTimer
 from PyQt5.QtWidgets import (QTabWidget, QTabBar, QSizePolicy, QCommonStyle,
@@ -296,7 +297,8 @@ class TabBar(QTabBar):
         """Set the tab bar font."""
         self.setFont(config.get('fonts', 'tabbar'))
 
-    def resizeEvent(self, s):
+    def resizeEvent(self, _s):
+        """Set the favicon size to the tabbar size minus some padding."""
         height = self.size().height()
         if height > 0:
             height = math.ceil(height - height / 7)