From 9764472fd81b29842dd2cab813f4849d0474d4ed Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Mon, 10 Dec 2018 14:44:04 +0100
Subject: [PATCH] Move adblock from browser/ to components/

---
 qutebrowser/app.py                                 | 2 +-
 qutebrowser/{browser => components}/adblock.py     | 0
 scripts/hostblock_blame.py                         | 2 +-
 tests/unit/{browser => components}/test_adblock.py | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename qutebrowser/{browser => components}/adblock.py (100%)
 rename tests/unit/{browser => components}/test_adblock.py (99%)

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