From 8593144fa78ca950d6acae23732fed70184f4769 Mon Sep 17 00:00:00 2001 From: Daniel Date: Thu, 24 Sep 2015 12:38:52 +0200 Subject: [PATCH] Make _path_suggestion public --- qutebrowser/browser/commands.py | 6 ++---- qutebrowser/browser/downloads.py | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index 6477bf3f4..f1b3f4661 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -37,14 +37,12 @@ import pygments.formatters from qutebrowser.commands import userscripts, cmdexc, cmdutils, runners from qutebrowser.config import config, configexc -from qutebrowser.browser import webelem, inspector, urlmarks +from qutebrowser.browser import webelem, inspector, urlmarks, downloads from qutebrowser.keyinput import modeman from qutebrowser.utils import (message, usertypes, log, qtutils, urlutils, objreg, utils) from qutebrowser.utils.usertypes import KeyMode from qutebrowser.misc import editor, guiprocess, mhtml -from qutebrowser.browser.downloads import (_path_suggestion as - download_path_suggestion) class CommandDispatcher: @@ -1172,7 +1170,7 @@ class CommandDispatcher: q.text = "Save page to: " q.mode = usertypes.PromptMode.text q.completed.connect(q.deleteLater) - q.default = download_path_suggestion(suggested_fn) + q.default = downloads.path_suggestion(suggested_fn) q.answered.connect(mhtml.start_download) message_bridge = objreg.get("message-bridge", scope="window", window=self._win_id) diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py index c446b6c55..a620970ed 100644 --- a/qutebrowser/browser/downloads.py +++ b/qutebrowser/browser/downloads.py @@ -70,7 +70,7 @@ def _download_dir(): return directory -def _path_suggestion(filename): +def path_suggestion(filename): """Get the suggested file path. Args: @@ -750,7 +750,7 @@ class DownloadManager(QAbstractListModel): suggested_fn = utils.force_encoding(suggested_fn, encoding) q = self._prepare_question() - q.default = _path_suggestion(suggested_fn) + q.default = path_suggestion(suggested_fn) message_bridge = objreg.get('message-bridge', scope='window', window=self._win_id) q.answered.connect( @@ -839,7 +839,7 @@ class DownloadManager(QAbstractListModel): download.autoclose = False else: q = self._prepare_question() - q.default = _path_suggestion(suggested_filename) + q.default = path_suggestion(suggested_filename) q.answered.connect(download.set_filename) q.cancelled.connect(download.cancel) download.cancelled.connect(q.abort)