diff -r 96232974dcdb -r 645c12de6b0c Helpviewer/Feeds/FeedsManager.py
--- a/Helpviewer/Feeds/FeedsManager.py Sun Mar 30 22:00:14 2014 +0200
+++ b/Helpviewer/Feeds/FeedsManager.py Thu Apr 03 23:05:31 2014 +0200
@@ -9,8 +9,8 @@
from __future__ import unicode_literals
try:
- str = unicode # __IGNORE_WARNING__
-except (NameError):
+ str = unicode
+except NameError:
pass
from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt, QUrl, QXmlStreamReader
@@ -180,8 +180,8 @@
if feed[0] == urlString:
E5MessageBox.critical(
self,
- self.trUtf8("Duplicate Feed URL"),
- self.trUtf8(
+ self.tr("Duplicate Feed URL"),
+ self.tr(
"""A feed with the URL {0} exists already."""
""" Aborting...""".format(urlString)))
return
@@ -202,8 +202,8 @@
title = itm.text(0)
res = E5MessageBox.yesNo(
self,
- self.trUtf8("Delete Feed"),
- self.trUtf8(
+ self.tr("Delete Feed"),
+ self.tr(
"""<p>Do you really want to delete the feed"""
""" <b>{0}</b>?</p>""".format(title)))
if res:
@@ -262,7 +262,7 @@
request = QNetworkRequest(QUrl(urlString))
reply = Helpviewer.HelpWindow.HelpWindow.networkAccessManager()\
.get(request)
- reply.finished[()].connect(self.__feedLoaded)
+ reply.finished.connect(self.__feedLoaded)
self.__replies[id(reply)] = (reply, itm)
def __feedLoaded(self):
@@ -309,7 +309,7 @@
if topItem.childCount() == 0:
itm = QTreeWidgetItem(topItem)
- itm.setText(0, self.trUtf8("Error fetching feed"))
+ itm.setText(0, self.tr("Error fetching feed"))
itm.setData(0, FeedsManager.UrlStringRole, "")
itm.setData(0, FeedsManager.ErrorDataRole,
str(xmlData, encoding="utf-8"))
@@ -340,11 +340,11 @@
if urlString:
menu = QMenu()
menu.addAction(
- self.trUtf8("&Open"), self.__openMessageInCurrentTab)
+ self.tr("&Open"), self.__openMessageInCurrentTab)
menu.addAction(
- self.trUtf8("Open in New &Tab"), self.__openMessageInNewTab)
+ self.tr("Open in New &Tab"), self.__openMessageInNewTab)
menu.addSeparator()
- menu.addAction(self.trUtf8("&Copy URL to Clipboard"),
+ menu.addAction(self.tr("&Copy URL to Clipboard"),
self.__copyUrlToClipboard)
menu.exec_(QCursor.pos())
else:
@@ -352,7 +352,7 @@
if errorString:
menu = QMenu()
menu.addAction(
- self.trUtf8("&Show error data"), self.__showError)
+ self.tr("&Show error data"), self.__showError)
menu.exec_(QCursor.pos())
def __itemActivated(self, itm, column):
@@ -432,5 +432,5 @@
if errorStr:
E5MessageBox.critical(
self,
- self.trUtf8("Error loading feed"),
+ self.tr("Error loading feed"),
"{0}".format(errorStr))
