Adjust imports/objreg

qutebrowser/app.py

@@ -46,7 +46,7 @@ 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, history, browsertab
-from qutebrowser.browser.webkit import cookies, cache, downloads
+from qutebrowser.browser.webkit import cookies, cache
 from qutebrowser.browser.webkit.network import networkmanager
 from qutebrowser.mainwindow import mainwindow, prompt
 from qutebrowser.misc import (readline, ipc, savemanager, sessions,

qutebrowser/browser/adblock.py

@@ -190,8 +190,8 @@ class HostBlocker:
         self._blocked_hosts = set()
         self._done_count = 0
         urls = config.get('content', 'host-block-lists')
-        download_manager = objreg.get('download-manager', scope='window',
-                                      window='last-focused')
+        download_manager = objreg.get('qtnetwork-download-manager',
+                                      scope='window', window='last-focused')
         if urls is None:
             return
         for url in urls:

qutebrowser/browser/commands.py

@@ -43,8 +43,7 @@ import pygments.formatters
 from qutebrowser.commands import userscripts, cmdexc, cmdutils, runners
 from qutebrowser.config import config, configexc
 from qutebrowser.browser import (urlmarks, browsertab, inspector, navigate,
-                                 webelem)
-from qutebrowser.browser.webkit import downloads
+                                 webelem, downloads)
 try:
     from qutebrowser.browser.webkit import mhtml
 except ImportError:
@@ -1318,8 +1317,9 @@ class CommandDispatcher:
                                           " download.")
             dest = dest_old
 
-        download_manager = objreg.get('download-manager', scope='window',
-                                      window=self._win_id)
+        # FIXME:qtwebengine do this with the QtWebEngine download manager?
+        download_manager = objreg.get('qtnetwork-download-manager',
+                                      scope='window', window=self._win_id)
         if url:
             if mhtml_:
                 raise cmdexc.CommandError("Can only download the current page"

qutebrowser/browser/downloadview.py

@@ -25,7 +25,7 @@ import sip
 from PyQt5.QtCore import pyqtSlot, QSize, Qt, QTimer
 from PyQt5.QtWidgets import QListView, QSizePolicy, QMenu
 
-from qutebrowser.browser.webkit import downloads
+from qutebrowser.browser import downloads
 from qutebrowser.config import style
 from qutebrowser.utils import qtutils, utils, objreg
 

qutebrowser/browser/hints.py

@@ -288,8 +288,9 @@ class HintActions:
         qnam = elem._elem.webFrame().page().networkAccessManager()
         # pylint: enable=protected-access
 
-        download_manager = objreg.get('download-manager', scope='window',
-                                      window=self._win_id)
+        # FIXME:qtwebengine do this with QtWebEngine downloads?
+        download_manager = objreg.get('qtnetwork-download-manager',
+                                      scope='window', window=self._win_id)
         download_manager.get(url, qnam=qnam, prompt_download_directory=prompt)
 
     def call_userscript(self, elem, context):

qutebrowser/browser/webkit/mhtml.py

@@ -34,7 +34,8 @@ import email.message
 
 from PyQt5.QtCore import QUrl
 
-from qutebrowser.browser.webkit import webkitelem, downloads
+from qutebrowser.browser import downloads
+from qutebrowser.browser.webkit import webkitelem
 from qutebrowser.utils import log, objreg, message, usertypes, utils, urlutils
 
 _File = collections.namedtuple('_File',
@@ -341,8 +342,8 @@ class _Downloader:
             self.writer.add_file(urlutils.encoded_url(url), b'')
             return
 
-        download_manager = objreg.get('download-manager', scope='window',
-                                      window=self._win_id)
+        download_manager = objreg.get('qtnetwork-download-manager',
+                                      scope='window', window=self._win_id)
         target = usertypes.FileObjDownloadTarget(_NoCloseBytesIO())
         item = download_manager.get(url, target=target,
                                     auto_remove=True)

qutebrowser/browser/webkit/webpage.py

@@ -219,8 +219,8 @@ class BrowserPage(QWebPage):
         """Prepare the web page for being deleted."""
         self._is_shutting_down = True
         self.shutting_down.emit()
-        download_manager = objreg.get('download-manager', scope='window',
-                                      window=self._win_id)
+        download_manager = objreg.get('qtnetwork-download-manager',
+                                      scope='window', window=self._win_id)
         nam = self.networkAccessManager()
         if download_manager.has_downloads_with_nam(nam):
             nam.setParent(download_manager)
@@ -252,8 +252,8 @@ class BrowserPage(QWebPage):
         after this slot returns.
         """
         req = QNetworkRequest(request)
-        download_manager = objreg.get('download-manager', scope='window',
-                                      window=self._win_id)
+        download_manager = objreg.get('qtnetwork-download-manager',
+                                      scope='window', window=self._win_id)
         download_manager.get_request(req, qnam=self.networkAccessManager())
 
     @pyqtSlot('QNetworkReply*')
@@ -267,8 +267,8 @@ class BrowserPage(QWebPage):
         here: http://mimesniff.spec.whatwg.org/
         """
         inline, suggested_filename = http.parse_content_disposition(reply)
-        download_manager = objreg.get('download-manager', scope='window',
-                                      window=self._win_id)
+        download_manager = objreg.get('qtnetwork-download-manager',
+                                      scope='window', window=self._win_id)
         if not inline:
             # Content-Disposition: attachment -> force download
             download_manager.fetch(reply,

qutebrowser/commands/userscripts.py

@@ -29,7 +29,7 @@ from qutebrowser.utils import message, log, objreg, standarddir
 from qutebrowser.commands import runners
 from qutebrowser.config import config
 from qutebrowser.misc import guiprocess
-from qutebrowser.browser.webkit import downloads
+from qutebrowser.browser import downloads
 
 
 class _QtFIFOReader(QObject):

qutebrowser/mainwindow/mainwindow.py

@@ -35,8 +35,8 @@ from qutebrowser.mainwindow import tabbedbrowser, messageview, prompt
 from qutebrowser.mainwindow.statusbar import bar
 from qutebrowser.completion import completionwidget, completer
 from qutebrowser.keyinput import modeman
-from qutebrowser.browser import commands, downloadview, hints
-from qutebrowser.browser.webkit import downloads
+from qutebrowser.browser import (commands, downloadview, hints,
+                                 qtnetworkdownloads, downloads)
 from qutebrowser.misc import crashsignal, keyhintwidget
 
 
@@ -258,9 +258,10 @@ class MainWindow(QWidget):
 
     def _init_downloadmanager(self):
         log.init.debug("Initializing downloads...")
-        download_manager = downloads.DownloadManager(self.win_id, self)
-        objreg.register('download-manager', download_manager, scope='window',
-                        window=self.win_id)
+        download_manager = qtnetworkdownloads.DownloadManager(self.win_id,
+                                                              self)
+        objreg.register('qtnetwork-download-manager', download_manager,
+                        scope='window', window=self.win_id)
         download_model = downloads.DownloadModel(download_manager)
         objreg.register('download-model', download_model, scope='window',
                         window=self.win_id)

tests/unit/browser/test_adblock.py

@@ -101,10 +101,11 @@ class FakeDownloadManager:
 def download_stub(win_registry):
     """Register a FakeDownloadManager."""
     stub = FakeDownloadManager()
-    objreg.register('download-manager', stub,
+    objreg.register('qtnetwork-download-manager', stub,
                     scope='window', window='last-focused')
     yield
-    objreg.delete('download-manager', scope='window', window='last-focused')
+    objreg.delete('qtnetwork-download-manager', scope='window',
+                  window='last-focused')
 
 
 def create_zipfile(directory, files, zipname='test'):

tests/unit/browser/webkit/test_downloads.py

@@ -18,12 +18,12 @@
 # along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from qutebrowser.browser.webkit import downloads
+from qutebrowser.browser import downloads, qtnetworkdownloads
 
 
 def test_download_model(qapp, qtmodeltester, config_stub, cookiejar_and_cache):
     """Simple check for download model internals."""
     config_stub.data = {'general': {'private-browsing': False}}
-    manager = downloads.DownloadManager(win_id=0)
+    manager = qtnetworkdownloads.DownloadManager(win_id=0)
     model = downloads.DownloadModel(manager)
     qtmodeltester.check(model)