eric: comparison Helpviewer/Download/DownloadItem.py

-:96232974dcdb
+:645c12de6b0c
 Module implementing a widget controlling a download.
 """
 from __future__ import unicode_literals
 try:
-str = unicode    # __IGNORE_WARNING__
+str = unicode
-except (NameError):
+except NameError:
 pass
 from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt, QTime, QFile, QFileInfo, \
 QUrl, QIODevice, QCryptographicHash
 from PyQt4.QtGui import QWidget, QPalette, QStyle, QDesktopServices, QDialog
 # attach to the reply object
 self.__url = self.__reply.url()
 self.__reply.setParent(self)
 self.__reply.setReadBufferSize(16 * 1024 * 1024)
-self.__reply.readyRead[()].connect(self.__readyRead)
+self.__reply.readyRead.connect(self.__readyRead)
 self.__reply.error.connect(self.__networkError)
 self.__reply.downloadProgress.connect(self.__downloadProgress)
 self.__reply.metaDataChanged.connect(self.__metaDataChanged)
-self.__reply.finished[()].connect(self.__finished)
+self.__reply.finished.connect(self.__finished)
 # reset info
 self.infoLabel.clear()
 self.progressBar.setValue(0)
 self.__getFileName()
 if dlg.exec_() == QDialog.Rejected or dlg.getAction() == "cancel":
 self.progressBar.setVisible(False)
 self.__reply.close()
 self.on_stopButton_clicked()
 self.filenameLabel.setText(
-self.trUtf8("Download canceled: {0}").format(
+self.tr("Download canceled: {0}").format(
 QFileInfo(defaultFileName).fileName()))
 self.__canceledFileSelect = True
 return
 if dlg.getAction() == "scan":
 self.progressBar.setVisible(False)
 self.__reply.close()
 self.on_stopButton_clicked()
 self.filenameLabel.setText(
-self.trUtf8("VirusTotal scan scheduled: {0}").format(
+self.tr("VirusTotal scan scheduled: {0}").format(
 QFileInfo(defaultFileName).fileName()))
 self.__canceledFileSelect = True
 return
 self.__autoOpen = dlg.getAction() == "open"
 if ask and not self.__autoOpen and self.__requestFilename:
 self.__gettingFileName = True
 fileName = E5FileDialog.getSaveFileName(
 None,
-self.trUtf8("Save File"),
+self.tr("Save File"),
 defaultFileName,
 "")
 self.__gettingFileName = False
 if not fileName:
 self.progressBar.setVisible(False)
 self.__reply.close()
 self.on_stopButton_clicked()
 self.filenameLabel.setText(
-self.trUtf8("Download canceled: {0}")
+self.tr("Download canceled: {0}")
 .format(QFileInfo(defaultFileName).fileName()))
 self.__canceledFileSelect = True
 return
 fileInfo = QFileInfo(fileName)
 saveDirPath = QFileInfo(self.__fileName).dir()
 if not saveDirPath.exists():
 if not saveDirPath.mkpath(saveDirPath.absolutePath()):
 self.progressBar.setVisible(False)
 self.on_stopButton_clicked()
-self.infoLabel.setText(self.trUtf8(
+self.infoLabel.setText(self.tr(
 "Download directory ({0}) couldn't be created.")
 .format(saveDirPath.absolutePath()))
 return
 self.filenameLabel.setText(QFileInfo(self.__fileName).fileName())
 Private slot to pause the download.
 @param checked flag indicating the state of the button (boolean)
 """
 if checked:
-self.__reply.readyRead[()].disconnect(self.__readyRead)
+self.__reply.readyRead.disconnect(self.__readyRead)
 self.__reply.setReadBufferSize(16 * 1024)
 else:
-self.__reply.readyRead[()].connect(self.__readyRead)
+self.__reply.readyRead.connect(self.__readyRead)
 self.__reply.setReadBufferSize(16 * 1024 * 1024)
 self.__readyRead()
 @pyqtSlot()
 def on_stopButton_clicked(self):
 # in case someone else has already put a file there
 if not self.__requestFilename:
 self.__getFileName()
 if not self.__output.open(QIODevice.WriteOnly):
 self.infoLabel.setText(
-self.trUtf8("Error opening save file: {0}")
+self.tr("Error opening save file: {0}")
 .format(self.__output.errorString()))
 self.on_stopButton_clicked()
 self.statusChanged.emit()
 return
 self.statusChanged.emit()
 buffer = self.__reply.readAll()
 self.__sha1Hash.addData(buffer)
 self.__md5Hash.addData(buffer)
 bytesWritten = self.__output.write(buffer)
 if bytesWritten == -1:
-self.infoLabel.setText(self.trUtf8("Error saving: {0}")
+self.infoLabel.setText(self.tr("Error saving: {0}")
 .format(self.__output.errorString()))
 self.on_stopButton_clicked()
 else:
 self.__startedSaving = True
 if self.__finishedDownloading:
 def __networkError(self):
 """
 Private slot to handle a network error.
 """
-self.infoLabel.setText(self.trUtf8("Network Error: {0}")
+self.infoLabel.setText(self.tr("Network Error: {0}")
 .format(self.__reply.errorString()))
 self.tryAgainButton.setEnabled(True)
 self.tryAgainButton.setVisible(True)
 self.downloadFinished.emit()
 remaining = ""
 if bytesTotal > 0:
 remaining = timeString(timeRemaining)
-info = self.trUtf8("{0} of {1} ({2}/sec)\n{3}")\
+info = self.tr("{0} of {1} ({2}/sec)\n{3}")\
 .format(
 dataString(self.__bytesReceived),
-bytesTotal == -1 and self.trUtf8("?")
+bytesTotal == -1 and self.tr("?")
 or dataString(bytesTotal),
 dataString(int(speed)),
 remaining)
 else:
 if self.__bytesReceived == bytesTotal or bytesTotal == -1:
-info = self.trUtf8("{0} downloaded\nSHA1: {1}\nMD5: {2}")\
+info = self.tr("{0} downloaded\nSHA1: {1}\nMD5: {2}")\
 .format(dataString(self.__output.size()),
 str(self.__sha1Hash.result().toHex(),
 encoding="ascii"),
 str(self.__md5Hash.result().toHex(),
 encoding="ascii")
 )
 else:
-info = self.trUtf8("{0} of {1} - Stopped")\
+info = self.tr("{0} of {1} - Stopped")\
 .format(dataString(self.__bytesReceived),
 dataString(bytesTotal))
 self.infoLabel.setText(info)
 def downloading(self):

Mercurial Repositories > eric / file comparison

comparison: Helpviewer/Download/DownloadItem.py

Helpviewer/Download/DownloadItem.py