Mercurial Repositories > eric / changeset

--- a/Cooperation/Connection.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Cooperation/Connection.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode   # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Debugger/DebugServer.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Debugger/DebugServer.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Debugger/VariablesViewer.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Debugger/VariablesViewer.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/E5Network/E5SslCertificatesInfoWidget.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/E5Network/E5SslCertificatesInfoWidget.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/E5XML/XMLStreamWriterBase.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/E5XML/XMLStreamWriterBase.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Helpviewer/Bookmarks/NsHtmlReader.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Helpviewer/Bookmarks/NsHtmlReader.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Helpviewer/Download/DownloadItem.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Helpviewer/Download/DownloadItem.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Helpviewer/Feeds/FeedsManager.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Helpviewer/Feeds/FeedsManager.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Helpviewer/FlashCookieManager/FlashCookieManager.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Helpviewer/FlashCookieManager/FlashCookieManager.py	Fri Mar 17 19:45:49 2017 +0100
@@ -10,7 +10,7 @@
 from __future__ import unicode_literals
 
 try:
-    str = unicode       # __IGNORE_EXCEPTION__ __IGNORE_WARNING_M131__
+    str = unicode       # __IGNORE_EXCEPTION__
 except NameError:
     pass
 

--- a/Helpviewer/HelpBrowserWV.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Helpviewer/HelpBrowserWV.py	Fri Mar 17 19:45:49 2017 +0100
@@ -10,7 +10,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_EXCEPTION__ __IGNORE_WARNING_M131__
+    str = unicode       # __IGNORE_EXCEPTION__
 except NameError:
     pass
 

--- a/Helpviewer/HelpWindow.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Helpviewer/HelpWindow.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Helpviewer/Network/FileReply.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Helpviewer/Network/FileReply.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Helpviewer/Network/FtpReply.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Helpviewer/Network/FtpReply.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Helpviewer/QtHelpDocumentationSelectionDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Helpviewer/QtHelpDocumentationSelectionDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -10,7 +10,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Helpviewer/SpeedDial/SpeedDial.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Helpviewer/SpeedDial/SpeedDial.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Helpviewer/UrlBar/FavIconLabel.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Helpviewer/UrlBar/FavIconLabel.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Helpviewer/UrlBar/UrlBar.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Helpviewer/UrlBar/UrlBar.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Helpviewer/VirusTotal/VirusTotalApi.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Helpviewer/VirusTotal/VirusTotalApi.py	Fri Mar 17 19:45:49 2017 +0100
@@ -10,7 +10,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/HexEdit/HexEditSearchReplaceWidget.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/HexEdit/HexEditSearchReplaceWidget.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_EXCEPTION__ __IGNORE_WARNING_M131__
+    str = unicode       # __IGNORE_EXCEPTION__
 except NameError:
     pass
 

--- a/HexEdit/HexEditWidget.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/HexEdit/HexEditWidget.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals, division
 try:
-    chr = unichr       # __IGNORE_EXCEPTION__ __IGNORE_WARNING_M131__
+    chr = unichr       # __IGNORE_EXCEPTION__
 except NameError:
     pass
 

--- a/Network/IRC/IrcWidget.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Network/IRC/IrcWidget.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleAddBuiltinIgnoreDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleAddBuiltinIgnoreDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -8,6 +8,8 @@
 be ignored.
 """
 
+from __future__ import unicode_literals
+
 from PyQt5.QtCore import pyqtSlot
 from PyQt5.QtWidgets import QDialog, QDialogButtonBox
 

--- a/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -10,7 +10,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsMercurial/HgClient.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgClient.py	Fri Mar 17 19:45:49 2017 +0100
@@ -8,7 +8,7 @@
 """
 
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsMercurial/HgDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffGenerator.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffGenerator.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -10,7 +10,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -10,7 +10,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsMercurial/HgUtilities.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgUtilities.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsMercurial/hg.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -10,7 +10,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -10,7 +10,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -10,7 +10,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Preferences/ProgramsDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Preferences/ProgramsDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Project/Project.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Project/Project.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode   # __IGNORE_EXCEPTION__ __IGNORE_WARNING_M131__
+    str = unicode   # __IGNORE_EXCEPTION__
 except NameError:
     pass
 

--- a/Project/ProjectFormsBrowser.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Project/ProjectFormsBrowser.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Project/ProjectInterfacesBrowser.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Project/ProjectInterfacesBrowser.py	Fri Mar 17 19:45:49 2017 +0100
@@ -10,7 +10,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Project/ProjectResourcesBrowser.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Project/ProjectResourcesBrowser.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/Project/ProjectTranslationsBrowser.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Project/ProjectTranslationsBrowser.py	Fri Mar 17 19:45:49 2017 +0100
@@ -10,7 +10,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode   # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/QScintilla/Editor.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/QScintilla/Editor.py	Fri Mar 17 19:45:49 2017 +0100
@@ -8,8 +8,8 @@
 """
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
-    chr = unichr        # __IGNORE_WARNING_M131__
+    str = unicode
+    chr = unichr
 except NameError:
     pass
 

--- a/QScintilla/TypingCompleters/CompleterPython.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/QScintilla/TypingCompleters/CompleterPython.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    chr = unichr        # __IGNORE_WARNING_M131__
+    chr = unichr
 except NameError:
     pass
 

--- a/ThirdParty/Send2Trash/send2trash/plat_other.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/ThirdParty/Send2Trash/send2trash/plat_other.py	Fri Mar 17 19:45:49 2017 +0100
@@ -16,7 +16,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/UI/BrowserModel.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/UI/BrowserModel.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/UI/SymbolsWidget.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/UI/SymbolsWidget.py	Fri Mar 17 19:45:49 2017 +0100
@@ -11,8 +11,8 @@
 
 try:
     # Py2
-    str = unicode                           # __IGNORE_WARNING_M131__
-    chr = unichr                            # __IGNORE_WARNING_M131__
+    str = unicode
+    chr = unichr
     import htmlentitydefs as html_entities
 except (NameError, ImportError):
     # Py3

--- a/UI/UserInterface.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/UI/UserInterface.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_EXCEPTION__ __IGNORE_WARNING_M131__
+    str = unicode       # __IGNORE_EXCEPTION__
 except NameError:
     pass
 

--- a/Utilities/BackgroundClient.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Utilities/BackgroundClient.py	Fri Mar 17 19:45:49 2017 +0100
@@ -11,7 +11,7 @@
 
 from __future__ import unicode_literals
 try:
-    bytes = unicode         # __IGNORE_WARNING_M131__
+    bytes = unicode
     import StringIO as io   # __IGNORE_EXCEPTION__
 except NameError:
     import io       # __IGNORE_WARNING__

--- a/Utilities/__init__.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Utilities/__init__.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
     import locale
     import urllib
 

--- a/Utilities/binplistlib.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/Utilities/binplistlib.py	Fri Mar 17 19:45:49 2017 +0100
@@ -54,7 +54,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/WebBrowser/Bookmarks/NsHtmlReader.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/WebBrowser/Bookmarks/NsHtmlReader.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/WebBrowser/Feeds/FeedsManager.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/WebBrowser/Feeds/FeedsManager.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_EXCEPTION__ __IGNORE_WARNING_M131__
+    str = unicode       # __IGNORE_EXCEPTION__
 except NameError:
     pass
 

--- a/WebBrowser/FlashCookieManager/FlashCookieManager.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/WebBrowser/FlashCookieManager/FlashCookieManager.py	Fri Mar 17 19:45:49 2017 +0100
@@ -10,7 +10,7 @@
 from __future__ import unicode_literals
 
 try:
-    str = unicode       # __IGNORE_EXCEPTION__ __IGNORE_WARNING_M131__
+    str = unicode       # __IGNORE_EXCEPTION__
 except NameError:
     pass
 

--- a/WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py	Fri Mar 17 19:45:49 2017 +0100
@@ -10,7 +10,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/WebBrowser/SpeedDial/SpeedDial.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/WebBrowser/SpeedDial/SpeedDial.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/WebBrowser/Tools/WebBrowserTools.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/WebBrowser/Tools/WebBrowserTools.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_EXCEPTION__ __IGNORE_WARNING_M131__
+    str = unicode       # __IGNORE_EXCEPTION__
 except NameError:
     pass
 

--- a/WebBrowser/UrlBar/FavIconLabel.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/WebBrowser/UrlBar/FavIconLabel.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_WARNING_M131__
+    str = unicode
 except NameError:
     pass
 

--- a/WebBrowser/UrlBar/UrlBar.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/WebBrowser/UrlBar/UrlBar.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_EXCEPTION__ __IGNORE_WARNING_M131__
+    str = unicode       # __IGNORE_EXCEPTION__
 except NameError:
     pass
 

--- a/WebBrowser/VirusTotal/VirusTotalApi.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/WebBrowser/VirusTotal/VirusTotalApi.py	Fri Mar 17 19:45:49 2017 +0100
@@ -10,7 +10,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_EXCEPTION__ __IGNORE_WARNING_M131__
+    str = unicode       # __IGNORE_EXCEPTION__
 except NameError:
     pass
 

--- a/WebBrowser/WebBrowserPage.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/WebBrowser/WebBrowserPage.py	Fri Mar 17 19:45:49 2017 +0100
@@ -10,7 +10,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode       # __IGNORE_EXCEPTION__ __IGNORE_WARNING_M131__
+    str = unicode       # __IGNORE_EXCEPTION__
 except NameError:
     pass
 

--- a/WebBrowser/WebBrowserView.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/WebBrowser/WebBrowserView.py	Fri Mar 17 19:45:49 2017 +0100
@@ -10,7 +10,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode           # __IGNORE_EXCEPTION__ __IGNORE_WARNING_M131__
+    str = unicode           # __IGNORE_EXCEPTION__
 except NameError:
     pass
 

--- a/WebBrowser/WebBrowserWindow.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/WebBrowser/WebBrowserWindow.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode           # __IGNORE_EXCEPTION__ __IGNORE_WARNING_M131__
+    str = unicode           # __IGNORE_EXCEPTION__
 except NameError:
     pass
 

--- a/WebBrowser/WebInspector.py	Fri Mar 17 19:25:58 2017 +0100
+++ b/WebBrowser/WebInspector.py	Fri Mar 17 19:45:49 2017 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 try:
-    str = unicode           # __IGNORE_EXCEPTION__ __IGNORE_WARNING_M131__
+    str = unicode           # __IGNORE_EXCEPTION__
 except NameError:
     pass
 

--- a/eric6.e4p	Fri Mar 17 19:25:58 2017 +0100
+++ b/eric6.e4p	Fri Mar 17 19:45:49 2017 +0100
@@ -1606,8 +1606,8 @@
     <Form>PluginManager/PluginInstallDialog.ui</Form>
     <Form>PluginManager/PluginRepositoryDialog.ui</Form>
     <Form>PluginManager/PluginUninstallDialog.ui</Form>
+    <Form>Plugins/AboutPlugin/AboutDialog.ui</Form>
     <Form>Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleAddBuiltinIgnoreDialog.ui</Form>
-    <Form>Plugins/AboutPlugin/AboutDialog.ui</Form>
     <Form>Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui</Form>
     <Form>Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCodeSelectionDialog.ui</Form>
     <Form>Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleStatisticsDialog.ui</Form>
@@ -1956,14 +1956,14 @@
   <Interfaces/>
   <Others>
     <Other>.hgignore</Other>
+    <Other>APIs/Python/zope-2.10.7.api</Other>
+    <Other>APIs/Python/zope-2.11.2.api</Other>
+    <Other>APIs/Python/zope-3.3.1.api</Other>
     <Other>APIs/Python3/PyQt4.bas</Other>
     <Other>APIs/Python3/PyQt5.bas</Other>
     <Other>APIs/Python3/QScintilla2.bas</Other>
     <Other>APIs/Python3/eric6.api</Other>
     <Other>APIs/Python3/eric6.bas</Other>
-    <Other>APIs/Python/zope-2.10.7.api</Other>
-    <Other>APIs/Python/zope-2.11.2.api</Other>
-    <Other>APIs/Python/zope-3.3.1.api</Other>
     <Other>APIs/QSS/qss.api</Other>
     <Other>APIs/Ruby/Ruby-1.8.7.api</Other>
     <Other>APIs/Ruby/Ruby-1.8.7.bas</Other>
@@ -2462,6 +2462,37 @@
         <value>
           <dict>
             <key>
+              <string>BuiltinsChecker</string>
+            </key>
+            <value>
+              <dict>
+                <key>
+                  <string>bytes</string>
+                </key>
+                <value>
+                  <list>
+                    <string>unicode</string>
+                  </list>
+                </value>
+                <key>
+                  <string>chr</string>
+                </key>
+                <value>
+                  <list>
+                    <string>unichr</string>
+                  </list>
+                </value>
+                <key>
+                  <string>str</string>
+                </key>
+                <value>
+                  <list>
+                    <string>unicode</string>
+                  </list>
+                </value>
+              </dict>
+            </value>
+            <key>
               <string>CopyrightAuthor</string>
             </key>
             <value>
@@ -2489,7 +2520,7 @@
               <string>ExcludeMessages</string>
             </key>
             <value>
-              <string>C101, E265, E266, E402, M811, N802, N803, N807, N808, N821, W293, E305</string>
+              <string>C101, E265, E266, E305, E402, M811, N802, N803, N807, N808, N821, W293, M821</string>
             </value>
             <key>
               <string>FixCodes</string>