From ae81427293f9772e90c6ed8114759f9ad7a5920e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 6 Feb 2014 06:54:57 +0100
Subject: [PATCH] Cleanup/Checks

---
 qutebrowser/utils/__init__.py     |  6 +++---
 qutebrowser/widgets/browser.py    | 12 +++++-------
 qutebrowser/widgets/completion.py |  9 +++++++--
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/qutebrowser/utils/__init__.py b/qutebrowser/utils/__init__.py
index 1dfa130d5..67c9bbcf0 100644
--- a/qutebrowser/utils/__init__.py
+++ b/qutebrowser/utils/__init__.py
@@ -21,9 +21,9 @@ def qurl(url):
     if not (re.match(r'^\w+://', url) or url.startswith('about:')):
         logging.debug("adding http:// to {}".format(url))
         url = 'http://' + url
-    qurl = QUrl(url)
-    logging.debug('Converting {} to qurl -> {}'.format(url, qurl.url()))
-    return qurl
+    newurl = QUrl(url)
+    logging.debug('Converting {} to qurl -> {}'.format(url, newurl.url()))
+    return newurl
 
 
 def version():
diff --git a/qutebrowser/widgets/browser.py b/qutebrowser/widgets/browser.py
index e81a45de6..03d8b5b39 100644
--- a/qutebrowser/widgets/browser.py
+++ b/qutebrowser/widgets/browser.py
@@ -65,12 +65,13 @@ class TabbedBrowser(TabWidget):
         self.setCurrentWidget(tab)
         tab.loadProgress.connect(self._filter_factory(self.cur_progress))
         tab.loadFinished.connect(self._filter_factory(self.cur_load_finished))
-        tab.loadStarted.connect(self._clear_signal_cache)
+        tab.loadStarted.connect(lambda args:
+                                self.sender().signal_cache.clear())
         tab.loadStarted.connect(self._filter_factory(self.cur_load_started))
         tab.statusBarMessage.connect(
-                self._filter_factory(self.cur_statusbar_message))
+            self._filter_factory(self.cur_statusbar_message))
         tab.scroll_pos_changed.connect(
-                self._filter_factory(self.cur_scroll_perc_changed))
+            self._filter_factory(self.cur_scroll_perc_changed))
         tab.titleChanged.connect(self._titleChanged_handler)
         # FIXME sometimes this doesn't load
         tab.open_tab.connect(self.tabopen)
@@ -319,9 +320,6 @@ class TabbedBrowser(TabWidget):
         """Returns a partial functon calling _filter_signals with a signal."""
         return functools.partial(self._filter_signals, signal)
 
-    def _clear_signal_cache(self, *args):
-        self.sender().signal_cache = OrderedDict()
-
     def _filter_signals(self, signal, *args):
         """Filter signals and trigger TabbedBrowser signals if the signal
         was sent from the _current_ tab and not from any other one.
@@ -344,7 +342,7 @@ class TabbedBrowser(TabWidget):
         dbgstr = "{} ({})".format(
             signal.signal, ','.join([str(e) for e in args]))
         sender = self.sender()
-        if type(sender) != type(self.currentWidget()):
+        if not isinstance(sender, BrowserTab):
             # FIXME why does this happen?
             logging.warn('Got signal "{}" by {} which is no tab!'.format(
                          dbgstr, sender))
diff --git a/qutebrowser/widgets/completion.py b/qutebrowser/widgets/completion.py
index 7235ce951..4a4dac719 100644
--- a/qutebrowser/widgets/completion.py
+++ b/qutebrowser/widgets/completion.py
@@ -11,7 +11,7 @@ import logging
 from PyQt5.QtWidgets import (QTreeView, QStyledItemDelegate, QStyle,
                              QStyleOptionViewItem, QSizePolicy)
 from PyQt5.QtCore import (QRectF, QRect, QPoint, pyqtSignal, Qt,
-                          QItemSelectionModel, QSize)
+                          QItemSelectionModel)
 from PyQt5.QtGui import (QIcon, QPalette, QTextDocument, QTextOption,
                          QTextCursor)
 
@@ -195,7 +195,12 @@ class CompletionItemDelegate(QStyledItemDelegate):
     painter = None
 
     def sizeHint(self, option, index):
-        value = index.data(Qt.SizeHintRole);
+        """Overrides sizeHint of QStyledItemDelegate.
+
+        Returns the cell size based on the QTextDocument size, but might not
+        work correctly yet.
+        """
+        value = index.data(Qt.SizeHintRole)
         if value is not None:
             return value
         self.opt = QStyleOptionViewItem(option)