diff --git a/qutebrowser/app.py b/qutebrowser/app.py index 5bd4b3388..9c1ce9991 100644 --- a/qutebrowser/app.py +++ b/qutebrowser/app.py @@ -63,7 +63,7 @@ from qutebrowser.completion.models import miscmodels from qutebrowser.commands import runners from qutebrowser.api import cmdutils from qutebrowser.config import config, websettings, configfiles, configinit -from qutebrowser.browser import (urlmarks, adblock, history, browsertab, +from qutebrowser.browser import (urlmarks, history, browsertab, qtnetworkdownloads, downloads, greasemonkey) from qutebrowser.browser.network import proxy from qutebrowser.browser.webkit import cookies, cache diff --git a/qutebrowser/browser/adblock.py b/qutebrowser/components/adblock.py similarity index 100% rename from qutebrowser/browser/adblock.py rename to qutebrowser/components/adblock.py diff --git a/scripts/hostblock_blame.py b/scripts/hostblock_blame.py index 2f68d2961..e5508f515 100644 --- a/scripts/hostblock_blame.py +++ b/scripts/hostblock_blame.py @@ -27,7 +27,7 @@ import os.path import urllib.request sys.path.insert(0, os.path.join(os.path.dirname(__file__), os.pardir)) -from qutebrowser.browser import adblock +from qutebrowser.components import adblock from qutebrowser.config import configdata diff --git a/tests/unit/browser/test_adblock.py b/tests/unit/components/test_adblock.py similarity index 99% rename from tests/unit/browser/test_adblock.py rename to tests/unit/components/test_adblock.py index e18c990cc..e354705dd 100644 --- a/tests/unit/browser/test_adblock.py +++ b/tests/unit/components/test_adblock.py @@ -28,7 +28,7 @@ import pytest from PyQt5.QtCore import QUrl -from qutebrowser.browser import adblock +from qutebrowser.components import adblock from qutebrowser.utils import urlmatch from tests.helpers import utils