rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make DownloadItem._retry_info private

Browse Source
This commit is contained in:
Florian Bruhin 2016-11-01 14:48:28 +01:00
parent 70e390a2e8
commit 34b4dcf0d5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qutebrowser/browser/webkit/downloads.py
View File

@ -273,7 +273,7 @@ class DownloadItem(QObject):
autoclose: Whether to close the associated file if the download is autoclose: Whether to close the associated file if the download is
done. done.
fileobj: The file object to download the file to. fileobj: The file object to download the file to.
retry_info: A _RetryInfo instance. _retry_info: A _RetryInfo instance.
raw_headers: The headers sent by the server. raw_headers: The headers sent by the server.
_filename: The filename of the download. _filename: The filename of the download.
_redirects: How many time we were redirected already. _redirects: How many time we were redirected already.
@ -312,7 +312,7 @@ class DownloadItem(QObject):
reply: The QNetworkReply to download. reply: The QNetworkReply to download.
""" """
super().__init__(parent) super().__init__(parent)
self.retry_info = None self._retry_info = None
self.done = False self.done = False
self.stats = DownloadItemStats(self) self.stats = DownloadItemStats(self)
self.index = 0 self.index = 0
@ -443,8 +443,8 @@ class DownloadItem(QObject):
reply.error.connect(self._on_reply_error) reply.error.connect(self._on_reply_error)
reply.readyRead.connect(self._on_ready_read) reply.readyRead.connect(self._on_ready_read)
reply.metaDataChanged.connect(self._on_meta_data_changed) reply.metaDataChanged.connect(self._on_meta_data_changed)
self.retry_info = _RetryInfo(request=reply.request(), self._retry_info = _RetryInfo(request=reply.request(),
manager=reply.manager()) manager=reply.manager())
if not self.fileobj: if not self.fileobj:
self._read_timer.start() self._read_timer.start()
# We could have got signals before we connected slots to them. # We could have got signals before we connected slots to them.
@ -521,7 +521,7 @@ class DownloadItem(QObject):
assert not self.successful assert not self.successful
download_manager = objreg.get('download-manager', scope='window', download_manager = objreg.get('download-manager', scope='window',
window=self._win_id) window=self._win_id)
new_reply = self.retry_info.manager.get(self.retry_info.request) new_reply = self._retry_info.manager.get(self._retry_info.request)
new_download = download_manager.fetch( new_download = download_manager.fetch(
new_reply, suggested_filename=self.basename) new_reply, suggested_filename=self.basename)
self.do_retry.emit(new_download) self.do_retry.emit(new_download)
@ -765,7 +765,7 @@ class DownloadItem(QObject):
running_nam = self._reply is not None and self._reply.manager() is nam running_nam = self._reply is not None and self._reply.manager() is nam
# user could request retry after tab is closed. # user could request retry after tab is closed.
retry_nam = (self.done and (not self.successful) and retry_nam = (self.done and (not self.successful) and
self.retry_info.manager is nam) self._retry_info.manager is nam)
return running_nam or retry_nam return running_nam or retry_nam