From 4e42ff1304f643c82f8f168f8335e3e33c1facfd Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 26 Sep 2014 16:44:41 +0200
Subject: [PATCH] Move tab_id_gen and add tab_id to webview repr.

---
 qutebrowser/utils/usertypes.py |  4 ----
 qutebrowser/widgets/webview.py | 12 +++++++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/qutebrowser/utils/usertypes.py b/qutebrowser/utils/usertypes.py
index 79b933af4..709aa283c 100644
--- a/qutebrowser/utils/usertypes.py
+++ b/qutebrowser/utils/usertypes.py
@@ -23,7 +23,6 @@ Module attributes:
     _UNSET: Used as default argument in the constructor so default can be None.
 """
 
-import itertools
 import operator
 import collections.abc
 import enum as pyenum
@@ -36,9 +35,6 @@ from qutebrowser.utils import log, qtutils, utils
 _UNSET = object()
 
 
-tab_id_gen = itertools.count(0)
-
-
 def enum(name, *items, start=1, is_int=False):
     """Factory for simple enumerations.
 
diff --git a/qutebrowser/widgets/webview.py b/qutebrowser/widgets/webview.py
index 018c2ab36..4269ae90e 100644
--- a/qutebrowser/widgets/webview.py
+++ b/qutebrowser/widgets/webview.py
@@ -19,6 +19,8 @@
 
 """The main browser widgets."""
 
+import itertools
+
 from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QTimer, QUrl
 from PyQt5.QtWidgets import QApplication
 from PyQt5.QtWebKit import QWebSettings
@@ -35,6 +37,9 @@ LoadStatus = usertypes.enum('LoadStatus', 'none', 'success', 'error', 'warn',
                             'loading')
 
 
+tab_id_gen = itertools.count(0)
+
+
 class WebView(QWebView):
 
     """One browser tab in TabbedBrowser.
@@ -91,6 +96,7 @@ class WebView(QWebView):
         self.cur_url = QUrl()
         self.progress = 0
         self.registry = objreg.ObjectRegistry()
+        self.tab_id = next(tab_id_gen)
         objreg.register('webview', self, registry=self.registry)
         page = webpage.BrowserPage(self)
         self.setPage(page)
@@ -98,8 +104,8 @@ class WebView(QWebView):
         hintmanager.mouse_event.connect(self.on_mouse_event)
         hintmanager.set_open_target.connect(self.set_force_open_target)
         objreg.register('hintmanager', hintmanager, registry=self.registry)
-        tab_id = next(usertypes.tab_id_gen)
-        objreg.register('tab-{}'.format(tab_id), self.registry, scope='meta')
+        objreg.register('tab-{}'.format(self.tab_id),
+                        self.registry, scope='meta')
         page.linkHovered.connect(self.linkHovered)
         page.mainFrame().loadStarted.connect(self.on_load_started)
         self.urlChanged.connect(self.on_url_changed)
@@ -113,7 +119,7 @@ class WebView(QWebView):
 
     def __repr__(self):
         url = utils.elide(self.url().toDisplayString(), 50)
-        return utils.get_repr(self, url=url)
+        return utils.get_repr(self, tab_id=self.tab_id, url=url)
 
     def _set_load_status(self, val):
         """Setter for load_status.