rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename browser.tab module and classes

Browse Source
This commit is contained in:
Florian Bruhin 2016-07-10 17:23:08 +02:00
parent 2649418c0b
commit b791095324
12 changed files with 59 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qutebrowser/browser/tab.py → qutebrowser/browser/browsertab.py
View File

@ -45,10 +45,10 @@ def create(win_id, parent=None):
mode_manager = modeman.instance(win_id) mode_manager = modeman.instance(win_id)
if objreg.get('args').backend == 'webengine': if objreg.get('args').backend == 'webengine':
from qutebrowser.browser.webengine import webenginetab from qutebrowser.browser.webengine import webenginetab
tab_class = webenginetab.WebEngineViewTab tab_class = webenginetab.WebEngineTab
else: else:
from qutebrowser.browser.webkit import webkittab from qutebrowser.browser.webkit import webkittab
tab_class = webkittab.WebViewTab tab_class = webkittab.WebKitTab
return tab_class(win_id=win_id, mode_manager=mode_manager, parent=parent) return tab_class(win_id=win_id, mode_manager=mode_manager, parent=parent)

5
qutebrowser/browser/commands.py
View File

@ -40,8 +40,7 @@ import pygments.formatters
from qutebrowser.commands import userscripts, cmdexc, cmdutils, runners from qutebrowser.commands import userscripts, cmdexc, cmdutils, runners
from qutebrowser.config import config, configexc from qutebrowser.config import config, configexc
from qutebrowser.browser import urlmarks from qutebrowser.browser import urlmarks, browsertab
from qutebrowser.browser import tab as tabmod
from qutebrowser.browser.webkit import webelem, inspector, downloads, mhtml from qutebrowser.browser.webkit import webelem, inspector, downloads, mhtml
from qutebrowser.keyinput import modeman from qutebrowser.keyinput import modeman
from qutebrowser.utils import (message, usertypes, log, qtutils, urlutils, from qutebrowser.utils import (message, usertypes, log, qtutils, urlutils,
@ -1122,7 +1121,7 @@ class CommandDispatcher:
""" """
try: try:
self._current_widget().caret.follow_selected(tab=tab) self._current_widget().caret.follow_selected(tab=tab)
except tabmod.WebTabError as e: except browsertab.WebTabError as e:
raise cmdexc.CommandError(str(e)) raise cmdexc.CommandError(str(e))
@cmdutils.register(instance='command-dispatcher', name='inspector', @cmdutils.register(instance='command-dispatcher', name='inspector',

14
qutebrowser/browser/webengine/webenginetab.py
View File

@ -29,12 +29,12 @@ from PyQt5.QtWidgets import QApplication
from PyQt5.QtWebEngineWidgets import QWebEnginePage from PyQt5.QtWebEngineWidgets import QWebEnginePage
# pylint: enable=no-name-in-module,import-error,useless-suppression # pylint: enable=no-name-in-module,import-error,useless-suppression
from qutebrowser.browser import tab as tabmod from qutebrowser.browser import browsertab
from qutebrowser.browser.webengine import webview from qutebrowser.browser.webengine import webview
from qutebrowser.utils import usertypes, qtutils, log from qutebrowser.utils import usertypes, qtutils, log
class WebEngineSearch(tabmod.AbstractSearch): class WebEngineSearch(browsertab.AbstractSearch):
"""QtWebEngine implementations related to searching on the page.""" """QtWebEngine implementations related to searching on the page."""
@ -51,7 +51,7 @@ class WebEngineSearch(tabmod.AbstractSearch):
log.stub() log.stub()
class WebEngineCaret(tabmod.AbstractCaret): class WebEngineCaret(browsertab.AbstractCaret):
"""QtWebEngine implementations related to moving the cursor/selection.""" """QtWebEngine implementations related to moving the cursor/selection."""
@ -126,7 +126,7 @@ class WebEngineCaret(tabmod.AbstractCaret):
log.stub() log.stub()
class WebEngineScroller(tabmod.AbstractScroller): class WebEngineScroller(browsertab.AbstractScroller):
"""QtWebEngine implementations related to scrolling.""" """QtWebEngine implementations related to scrolling."""
@ -203,7 +203,7 @@ class WebEngineScroller(tabmod.AbstractScroller):
log.stub() log.stub()
class WebEngineHistory(tabmod.AbstractHistory): class WebEngineHistory(browsertab.AbstractHistory):
"""QtWebEngine implementations related to page history.""" """QtWebEngine implementations related to page history."""
@ -232,7 +232,7 @@ class WebEngineHistory(tabmod.AbstractHistory):
log.stub() log.stub()
class WebEngineZoom(tabmod.AbstractZoom): class WebEngineZoom(browsertab.AbstractZoom):
"""QtWebEngine implementations related to zooming.""" """QtWebEngine implementations related to zooming."""
@ -243,7 +243,7 @@ class WebEngineZoom(tabmod.AbstractZoom):
return self._widget.zoomFactor() return self._widget.zoomFactor()
class WebEngineViewTab(tabmod.AbstractTab): class WebEngineTab(browsertab.AbstractTab):
"""A QtWebEngine tab in the browser.""" """A QtWebEngine tab in the browser."""

30
qutebrowser/browser/webkit/webkittab.py
View File

@ -28,12 +28,12 @@ from PyQt5.QtGui import QKeyEvent
from PyQt5.QtWebKitWidgets import QWebPage from PyQt5.QtWebKitWidgets import QWebPage
from PyQt5.QtWebKit import QWebSettings from PyQt5.QtWebKit import QWebSettings
from qutebrowser.browser import tab as tabmod from qutebrowser.browser import browsertab
from qutebrowser.browser.webkit import webview, tabhistory from qutebrowser.browser.webkit import webview, tabhistory
from qutebrowser.utils import qtutils, objreg, usertypes, utils from qutebrowser.utils import qtutils, objreg, usertypes, utils
class WebViewSearch(tabmod.AbstractSearch): class WebKitSearch(browsertab.AbstractSearch):
"""QtWebKit implementations related to searching on the page.""" """QtWebKit implementations related to searching on the page."""
@ -75,7 +75,7 @@ class WebViewSearch(tabmod.AbstractSearch):
self._widget.search(self.text, flags) self._widget.search(self.text, flags)
class WebViewCaret(tabmod.AbstractCaret): class WebKitCaret(browsertab.AbstractCaret):
"""QtWebKit implementations related to moving the cursor/selection.""" """QtWebKit implementations related to moving the cursor/selection."""
@ -281,13 +281,13 @@ class WebViewCaret(tabmod.AbstractCaret):
selected_element = xml.etree.ElementTree.fromstring( selected_element = xml.etree.ElementTree.fromstring(
'<html>{}</html>'.format(selection)).find('a') '<html>{}</html>'.format(selection)).find('a')
except xml.etree.ElementTree.ParseError: except xml.etree.ElementTree.ParseError:
raise tabmod.WebTabError('Could not parse selected element!') raise browsertab.WebTabError('Could not parse selected element!')
if selected_element is not None: if selected_element is not None:
try: try:
url = selected_element.attrib['href'] url = selected_element.attrib['href']
except KeyError: except KeyError:
raise tabmod.WebTabError('Anchor element without href!') raise browsertab.WebTabError('Anchor element without href!')
url = self._tab.url().resolved(QUrl(url)) url = self._tab.url().resolved(QUrl(url))
if tab: if tab:
self._tab.new_tab_requested.emit(url) self._tab.new_tab_requested.emit(url)
@ -295,7 +295,7 @@ class WebViewCaret(tabmod.AbstractCaret):
self._tab.openurl(url) self._tab.openurl(url)
class WebViewZoom(tabmod.AbstractZoom): class WebKitZoom(browsertab.AbstractZoom):
"""QtWebKit implementations related to zooming.""" """QtWebKit implementations related to zooming."""
@ -306,7 +306,7 @@ class WebViewZoom(tabmod.AbstractZoom):
return self._widget.zoomFactor() return self._widget.zoomFactor()
class WebViewScroller(tabmod.AbstractScroller): class WebKitScroller(browsertab.AbstractScroller):
"""QtWebKit implementations related to scrolling.""" """QtWebKit implementations related to scrolling."""
@ -406,7 +406,7 @@ class WebViewScroller(tabmod.AbstractScroller):
return self.pos_px().y() >= frame.scrollBarMaximum(Qt.Vertical) return self.pos_px().y() >= frame.scrollBarMaximum(Qt.Vertical)
class WebViewHistory(tabmod.AbstractHistory): class WebKitHistory(browsertab.AbstractHistory):
"""QtWebKit implementations related to page history.""" """QtWebKit implementations related to page history."""
@ -446,19 +446,19 @@ class WebViewHistory(tabmod.AbstractHistory):
self._tab.scroll.to_point, cur_data['scroll-pos'])) self._tab.scroll.to_point, cur_data['scroll-pos']))
class WebViewTab(tabmod.AbstractTab): class WebKitTab(browsertab.AbstractTab):
"""A QtWebKit tab in the browser.""" """A QtWebKit tab in the browser."""
def __init__(self, win_id, mode_manager, parent=None): def __init__(self, win_id, mode_manager, parent=None):
super().__init__(win_id) super().__init__(win_id)
widget = webview.WebView(win_id, self.tab_id, tab=self) widget = webview.WebView(win_id, self.tab_id, tab=self)
self.history = WebViewHistory(self) self.history = WebKitHistory(self)
self.scroll = WebViewScroller(parent=self) self.scroll = WebKitScroller(parent=self)
self.caret = WebViewCaret(win_id=win_id, mode_manager=mode_manager, self.caret = WebKitCaret(win_id=win_id, mode_manager=mode_manager,
tab=self, parent=self) tab=self, parent=self)
self.zoom = WebViewZoom(win_id=win_id, parent=self) self.zoom = WebKitZoom(win_id=win_id, parent=self)
self.search = WebViewSearch(parent=self) self.search = WebKitSearch(parent=self)
self._set_widget(widget) self._set_widget(widget)
self._connect_signals() self._connect_signals()
self.zoom.set_default() self.zoom.set_default()

4
qutebrowser/completion/models/miscmodels.py
View File

@ -22,7 +22,7 @@
from collections import defaultdict from collections import defaultdict
from PyQt5.QtCore import Qt, QTimer, pyqtSlot from PyQt5.QtCore import Qt, QTimer, pyqtSlot
from qutebrowser.browser import tab as tabmod from qutebrowser.browser import browsertab
from qutebrowser.config import config, configdata from qutebrowser.config import config, configdata
from qutebrowser.utils import objreg, log, qtutils, utils from qutebrowser.utils import objreg, log, qtutils, utils
from qutebrowser.commands import cmdutils from qutebrowser.commands import cmdutils
@ -193,7 +193,7 @@ class TabCompletionModel(base.BaseCompletionModel):
"""Add hooks to new windows.""" """Add hooks to new windows."""
window.tabbed_browser.new_tab.connect(self.on_new_tab) window.tabbed_browser.new_tab.connect(self.on_new_tab)
@pyqtSlot(tabmod.AbstractTab) @pyqtSlot(browsertab.AbstractTab)
def on_new_tab(self, tab): def on_new_tab(self, tab):
"""Add hooks to new tabs.""" """Add hooks to new tabs."""
tab.url_text_changed.connect(self.rebuild) tab.url_text_changed.connect(self.rebuild)

4
qutebrowser/mainwindow/statusbar/percentage.py
View File

@ -21,7 +21,7 @@
from PyQt5.QtCore import pyqtSlot from PyQt5.QtCore import pyqtSlot
from qutebrowser.browser import tab as tabmod from qutebrowser.browser import browsertab
from qutebrowser.mainwindow.statusbar import textbase from qutebrowser.mainwindow.statusbar import textbase
@ -51,7 +51,7 @@ class Percentage(textbase.TextBase):
else: else:
self.setText('[{:2}%]'.format(y)) self.setText('[{:2}%]'.format(y))
@pyqtSlot(tabmod.AbstractTab) @pyqtSlot(browsertab.AbstractTab)
def on_tab_changed(self, tab): def on_tab_changed(self, tab):
"""Update scroll position when tab changed.""" """Update scroll position when tab changed."""
self.set_perc(*tab.scroll.pos_perc()) self.set_perc(*tab.scroll.pos_perc())

4
qutebrowser/mainwindow/statusbar/progress.py
View File

@ -22,7 +22,7 @@
from PyQt5.QtCore import pyqtSlot, QSize from PyQt5.QtCore import pyqtSlot, QSize
from PyQt5.QtWidgets import QProgressBar, QSizePolicy from PyQt5.QtWidgets import QProgressBar, QSizePolicy
from qutebrowser.browser import tab as tabmod from qutebrowser.browser import browsertab
from qutebrowser.config import style from qutebrowser.config import style
from qutebrowser.utils import utils, usertypes from qutebrowser.utils import utils, usertypes
@ -59,7 +59,7 @@ class Progress(QProgressBar):
self.setValue(0) self.setValue(0)
self.show() self.show()
@pyqtSlot(tabmod.AbstractTab) @pyqtSlot(browsertab.AbstractTab)
def on_tab_changed(self, tab): def on_tab_changed(self, tab):
"""Set the correct value when the current tab changed.""" """Set the correct value when the current tab changed."""
if self is None: # pragma: no branch if self is None: # pragma: no branch

4
qutebrowser/mainwindow/statusbar/text.py
View File

@ -21,7 +21,7 @@
from PyQt5.QtCore import pyqtSlot from PyQt5.QtCore import pyqtSlot
from qutebrowser.browser import tab as tabmod from qutebrowser.browser import browsertab
from qutebrowser.config import config from qutebrowser.config import config
from qutebrowser.mainwindow.statusbar import textbase from qutebrowser.mainwindow.statusbar import textbase
from qutebrowser.utils import usertypes, log, objreg from qutebrowser.utils import usertypes, log, objreg
@ -99,7 +99,7 @@ class Text(textbase.TextBase):
"""Clear jstext when page loading started.""" """Clear jstext when page loading started."""
self._jstext = '' self._jstext = ''
@pyqtSlot(tabmod.AbstractTab) @pyqtSlot(browsertab.AbstractTab)
def on_tab_changed(self, tab): def on_tab_changed(self, tab):
"""Set the correct jstext when the current tab changed.""" """Set the correct jstext when the current tab changed."""
self._jstext = tab.statusbar_message self._jstext = tab.statusbar_message

4
qutebrowser/mainwindow/statusbar/url.py
View File

@ -21,7 +21,7 @@
from PyQt5.QtCore import pyqtSlot, pyqtProperty, Qt, QUrl from PyQt5.QtCore import pyqtSlot, pyqtProperty, Qt, QUrl
from qutebrowser.browser import tab as tabmod from qutebrowser.browser import browsertab
from qutebrowser.mainwindow.statusbar import textbase from qutebrowser.mainwindow.statusbar import textbase
from qutebrowser.config import style from qutebrowser.config import style
from qutebrowser.utils import usertypes from qutebrowser.utils import usertypes
@ -160,7 +160,7 @@ class UrlText(textbase.TextBase):
self._hover_url = None self._hover_url = None
self._update_url() self._update_url()
@pyqtSlot(tabmod.AbstractTab) @pyqtSlot(browsertab.AbstractTab)
def on_tab_changed(self, tab): def on_tab_changed(self, tab):
"""Update URL if the tab changed.""" """Update URL if the tab changed."""
self._hover_url = None self._hover_url = None

17
qutebrowser/mainwindow/tabbedbrowser.py
View File

@ -29,8 +29,7 @@ from PyQt5.QtGui import QIcon
from qutebrowser.config import config from qutebrowser.config import config
from qutebrowser.keyinput import modeman from qutebrowser.keyinput import modeman
from qutebrowser.mainwindow import tabwidget from qutebrowser.mainwindow import tabwidget
from qutebrowser.browser import signalfilter from qutebrowser.browser import signalfilter, browsertab
from qutebrowser.browser import tab as tabmod
from qutebrowser.utils import (log, usertypes, utils, qtutils, objreg, from qutebrowser.utils import (log, usertypes, utils, qtutils, objreg,
urlutils, message) urlutils, message)
@ -100,8 +99,8 @@ class TabbedBrowser(tabwidget.TabWidget):
cur_load_status_changed = pyqtSignal(str) cur_load_status_changed = pyqtSignal(str)
close_window = pyqtSignal() close_window = pyqtSignal()
resized = pyqtSignal('QRect') resized = pyqtSignal('QRect')
current_tab_changed = pyqtSignal(tabmod.AbstractTab) current_tab_changed = pyqtSignal(browsertab.AbstractTab)
new_tab = pyqtSignal(tabmod.AbstractTab, int) new_tab = pyqtSignal(browsertab.AbstractTab, int)
def __init__(self, win_id, parent=None): def __init__(self, win_id, parent=None):
super().__init__(win_id, parent) super().__init__(win_id, parent)
@ -338,7 +337,7 @@ class TabbedBrowser(tabwidget.TabWidget):
return return
self.close_tab(tab) self.close_tab(tab)
@pyqtSlot(tabmod.AbstractTab) @pyqtSlot(browsertab.AbstractTab)
def on_window_close_requested(self, widget): def on_window_close_requested(self, widget):
"""Close a tab with a widget given.""" """Close a tab with a widget given."""
try: try:
@ -380,7 +379,7 @@ class TabbedBrowser(tabwidget.TabWidget):
window=window.win_id) window=window.win_id)
return tabbed_browser.tabopen(url, background, explicit) return tabbed_browser.tabopen(url, background, explicit)
tab = tabmod.create(win_id=self._win_id, parent=self) tab = browsertab.create(win_id=self._win_id, parent=self)
self._connect_tab_signals(tab) self._connect_tab_signals(tab)
idx = self._get_new_tab_idx(explicit) idx = self._get_new_tab_idx(explicit)
@ -479,7 +478,7 @@ class TabbedBrowser(tabwidget.TabWidget):
modeman.maybe_leave(self._win_id, usertypes.KeyMode.hint, modeman.maybe_leave(self._win_id, usertypes.KeyMode.hint,
'load started') 'load started')
@pyqtSlot(tabmod.AbstractTab, str) @pyqtSlot(browsertab.AbstractTab, str)
def on_title_changed(self, tab, text): def on_title_changed(self, tab, text):
"""Set the title of a tab. """Set the title of a tab.
@ -503,7 +502,7 @@ class TabbedBrowser(tabwidget.TabWidget):
if idx == self.currentIndex(): if idx == self.currentIndex():
self.update_window_title() self.update_window_title()
@pyqtSlot(tabmod.AbstractTab, str) @pyqtSlot(browsertab.AbstractTab, str)
def on_url_text_changed(self, tab, url): def on_url_text_changed(self, tab, url):
"""Set the new URL as title if there's no title yet. """Set the new URL as title if there's no title yet.
@ -519,7 +518,7 @@ class TabbedBrowser(tabwidget.TabWidget):
if not self.page_title(idx): if not self.page_title(idx):
self.set_page_title(idx, url) self.set_page_title(idx, url)
@pyqtSlot(tabmod.AbstractTab, QIcon) @pyqtSlot(browsertab.AbstractTab, QIcon)
def on_icon_changed(self, tab, icon): def on_icon_changed(self, tab, icon):
"""Set the icon of a tab. """Set the icon of a tab.

8
tests/helpers/stubs.py
View File

@ -29,7 +29,7 @@ from PyQt5.QtNetwork import (QNetworkRequest, QAbstractNetworkCache,
QNetworkCacheMetaData) QNetworkCacheMetaData)
from PyQt5.QtWidgets import QCommonStyle, QLineEdit from PyQt5.QtWidgets import QCommonStyle, QLineEdit
from qutebrowser.browser import tab from qutebrowser.browser import browsertab
from qutebrowser.browser.webkit import history from qutebrowser.browser.webkit import history
from qutebrowser.config import configexc from qutebrowser.config import configexc
from qutebrowser.utils import usertypes from qutebrowser.utils import usertypes
@ -225,7 +225,7 @@ def fake_qprocess():
return m return m
class FakeWebTabScroller(tab.AbstractScroller): class FakeWebTabScroller(browsertab.AbstractScroller):
"""Fake AbstractScroller to use in tests.""" """Fake AbstractScroller to use in tests."""
@ -237,7 +237,7 @@ class FakeWebTabScroller(tab.AbstractScroller):
return self._pos_perc return self._pos_perc
class FakeWebTab(tab.AbstractTab): class FakeWebTab(browsertab.AbstractTab):
"""Fake AbstractTab to use in tests.""" """Fake AbstractTab to use in tests."""
@ -544,7 +544,7 @@ class TabbedBrowserStub(QObject):
"""Stub for the tabbed-browser object.""" """Stub for the tabbed-browser object."""
new_tab = pyqtSignal(tab.AbstractTab, int) new_tab = pyqtSignal(browsertab.AbstractTab, int)
def __init__(self, parent=None): def __init__(self, parent=None):
super().__init__(parent) super().__init__(parent)

22
tests/unit/browser/test_tab.py
View File

@ -21,7 +21,7 @@ import pytest
from PyQt5.QtCore import pyqtSignal, QPoint from PyQt5.QtCore import pyqtSignal, QPoint
from qutebrowser.browser import tab from qutebrowser.browser import browsertab
from qutebrowser.keyinput import modeman from qutebrowser.keyinput import modeman
try: try:
@ -59,7 +59,7 @@ def test_tab(qtbot, view, config_stub, tab_registry):
w = view() w = view()
qtbot.add_widget(w) qtbot.add_widget(w)
tab_w = tab.AbstractTab(win_id=0) tab_w = browsertab.AbstractTab(win_id=0)
qtbot.add_widget(tab_w) qtbot.add_widget(tab_w)
tab_w.show() tab_w.show()
@ -68,13 +68,13 @@ def test_tab(qtbot, view, config_stub, tab_registry):
mode_manager = modeman.ModeManager(0) mode_manager = modeman.ModeManager(0)
tab_w.history = tab.AbstractHistory(tab_w) tab_w.history = browsertab.AbstractHistory(tab_w)
tab_w.scroll = tab.AbstractScroller(parent=tab_w) tab_w.scroll = browsertab.AbstractScroller(parent=tab_w)
tab_w.caret = tab.AbstractCaret(win_id=tab_w.win_id, tab_w.caret = browsertab.AbstractCaret(win_id=tab_w.win_id,
mode_manager=mode_manager, tab=tab_w, mode_manager=mode_manager,
parent=tab_w) tab=tab_w, parent=tab_w)
tab_w.zoom = tab.AbstractZoom(win_id=tab_w.win_id) tab_w.zoom = browsertab.AbstractZoom(win_id=tab_w.win_id)
tab_w.search = tab.AbstractSearch(parent=tab_w) tab_w.search = browsertab.AbstractSearch(parent=tab_w)
tab_w._set_widget(w) tab_w._set_widget(w)
assert tab_w._widget is w assert tab_w._widget is w
@ -86,13 +86,13 @@ def test_tab(qtbot, view, config_stub, tab_registry):
class TestTabData: class TestTabData:
def test_known_attr(self): def test_known_attr(self):
data = tab.TabData() data = browsertab.TabData()
assert not data.keep_icon assert not data.keep_icon
data.keep_icon = True data.keep_icon = True
assert data.keep_icon assert data.keep_icon
def test_unknown_attr(self): def test_unknown_attr(self):
data = tab.TabData() data = browsertab.TabData()
with pytest.raises(AttributeError): with pytest.raises(AttributeError):
data.bar = 42 # pylint: disable=assigning-non-slot data.bar = 42 # pylint: disable=assigning-non-slot
with pytest.raises(AttributeError): with pytest.raises(AttributeError):