Move adblock from browser/ to components/

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

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
 
 

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