Move browser.webkit.history to browser.history

qutebrowser/app.py

@@ -46,8 +46,8 @@ import qutebrowser.resources
 from qutebrowser.completion.models import instances as completionmodels
 from qutebrowser.commands import cmdutils, runners, cmdexc
 from qutebrowser.config import style, config, websettings, configexc
-from qutebrowser.browser import urlmarks, adblock
-from qutebrowser.browser.webkit import cookies, cache, history, downloads
+from qutebrowser.browser import urlmarks, adblock, history
+from qutebrowser.browser.webkit import cookies, cache, downloads
 from qutebrowser.browser.webkit.network import (qutescheme, proxy,
                                                 networkmanager)
 from qutebrowser.mainwindow import mainwindow

tests/helpers/stubs.py

@@ -29,8 +29,7 @@ from PyQt5.QtNetwork import (QNetworkRequest, QAbstractNetworkCache,
                              QNetworkCacheMetaData)
 from PyQt5.QtWidgets import QCommonStyle, QLineEdit, QWidget
 
-from qutebrowser.browser import browsertab
-from qutebrowser.browser.webkit import history
+from qutebrowser.browser import browsertab, history
 from qutebrowser.config import configexc
 from qutebrowser.utils import usertypes, utils
 from qutebrowser.mainwindow import mainwindow

tests/unit/browser/webkit/test_history.py

@@ -28,7 +28,7 @@ from hypothesis import strategies
 from PyQt5.QtCore import QUrl
 from PyQt5.QtWebKit import QWebHistoryInterface
 
-from qutebrowser.browser.webkit import history
+from qutebrowser.browser import history
 from qutebrowser.utils import objreg
 
 

tests/unit/completion/test_models.py

@@ -27,7 +27,7 @@ from PyQt5.QtCore import QUrl
 from PyQt5.QtWidgets import QTreeView
 
 from qutebrowser.completion.models import miscmodels, urlmodel, configmodel
-from qutebrowser.browser.webkit import history
+from qutebrowser.browser import history
 from qutebrowser.config import sections, value