Merged with default branch to prepare a new release. maintenance release-20.01

Wed, 01 Jan 2020 12:01:54 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Wed, 01 Jan 2020 12:01:54 +0100
branch
maintenance
changeset 7362
028bf21bb5a2
parent 7351
274baadc5686 (diff)
parent 7361
b5024d3a0c33 (current diff)
child 7363
7fe343f85860

Merged with default branch to prepare a new release.

docs/changelog file | annotate | diff | comparison | revisions
eric6.e4p file | annotate | diff | comparison | revisions
eric6/APIs/Python3/eric6.api file | annotate | diff | comparison | revisions
eric6/DebugClients/Python/ThreadExtension.py file | annotate | diff | comparison | revisions
eric6/Debugger/DebugServer.py file | annotate | diff | comparison | revisions
eric6/Documentation/Help/source.qch file | annotate | diff | comparison | revisions
eric6/Documentation/Help/source.qhp file | annotate | diff | comparison | revisions
eric6/E5Gui/E5TextEditSearchWidget.py file | annotate | diff | comparison | revisions
eric6/E5Gui/E5ZoomWidget.py file | annotate | diff | comparison | revisions
eric6/Graphics/UMLGraphicsView.py file | annotate | diff | comparison | revisions
eric6/PipInterface/PipFreezeDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py file | annotate | diff | comparison | revisions
eric6/Plugins/ViewManagerPlugins/Listspace/Listspace.py file | annotate | diff | comparison | revisions
eric6/Plugins/ViewManagerPlugins/Tabview/Tabview.py file | annotate | diff | comparison | revisions
eric6/Preferences/ConfigurationDialog.py file | annotate | diff | comparison | revisions
eric6/Preferences/ConfigurationPages/EditorAutocompletionPage.py file | annotate | diff | comparison | revisions
eric6/Preferences/__init__.py file | annotate | diff | comparison | revisions
eric6/QScintilla/Editor.py file | annotate | diff | comparison | revisions
eric6/QScintilla/Shell.py file | annotate | diff | comparison | revisions
eric6/UI/Previewers/PreviewerHTML.py file | annotate | diff | comparison | revisions
eric6/UI/UserInterface.py file | annotate | diff | comparison | revisions
eric6/ViewManager/ViewManager.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Download/DownloadItem.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Network/NetworkManager.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/Network/QtHelpSchemeHandler.py file | annotate | diff | comparison | revisions
eric6/WebBrowser/WebBrowserView.py file | annotate | diff | comparison | revisions
eric6/i18n/eric6_cs.ts file | annotate | diff | comparison | revisions
eric6/i18n/eric6_de.qm file | annotate | diff | comparison | revisions
eric6/i18n/eric6_de.ts file | annotate | diff | comparison | revisions
eric6/i18n/eric6_empty.ts file | annotate | diff | comparison | revisions
eric6/i18n/eric6_en.ts file | annotate | diff | comparison | revisions
eric6/i18n/eric6_es.ts file | annotate | diff | comparison | revisions
eric6/i18n/eric6_fr.ts file | annotate | diff | comparison | revisions
eric6/i18n/eric6_it.ts file | annotate | diff | comparison | revisions
eric6/i18n/eric6_pt.ts file | annotate | diff | comparison | revisions
eric6/i18n/eric6_ru.qm file | annotate | diff | comparison | revisions
eric6/i18n/eric6_ru.ts file | annotate | diff | comparison | revisions
eric6/i18n/eric6_tr.ts file | annotate | diff | comparison | revisions
eric6/i18n/eric6_zh_CN.ts file | annotate | diff | comparison | revisions
scripts/install.py file | annotate | diff | comparison | revisions
--- a/.hgtags	Wed Jan 01 12:00:06 2020 +0100
+++ b/.hgtags	Wed Jan 01 12:01:54 2020 +0100
@@ -25,3 +25,47 @@
 7c5fef569684f5e7edda2e6bf3c466bc812f8cae release-6.0.0-RC1
 8ff05a7798ac183732bb9fb34cff249c9a4ece69 release-16.11
 112840bac20c339e7de897deebf7b5cf9016cc4e release-16.11.1
+d2bef1e78194dabd24defbac1179bb2b6372cc2a release-16.12
+5e79ebb03b102c47038b3c568495f9aa511d5584 release-17.01
+b46f68bbd6b4ac06790feb4713fb6e2b04fe4882 release-17.02
+b46f68bbd6b4ac06790feb4713fb6e2b04fe4882 release-17.02
+3ad8620b828b6d8490891c8898e9a16dee50a866 release-17.02
+3790c6f62c5cad71a8c560c0bd8849da4f9dd5e5 release-17.02.1
+106581f40cc26a68ceb8d995828dca004d7dbf3a release-17.03
+63eb46a7c3e8b5c7a38bb100438bd1e6c4c4f9de release-17.03.1
+be30320a29bccd9dd4019ad36cc4aeffa48437d3 release-17.04
+27f8227ba598052663c6b2f40bcdad866f7473f1 release-17.04.1
+6422afc7adc4ec10f7b8eeea13ff207989cc03ba release-17.05
+1860eca908e4ce5c8256c5cfdd51d8f950301063 release-17.06
+49ba4a9f04215068aea6c5a51634b1445250326b release-17.07
+9487c08b6a23001f6d251623d7f30f58511cf85a release-17.08
+0752bdd8db779f43dd2d973651650169d4e0a8a4 release-17.09
+5228afbb870f86fa5fd187f7065c8f7ba0187fe6 release-17.10
+7fa6400debb4015b16cba425a2ab0d9f7848c569 release-17.11
+a604749f4fcc8762d769243f8e35854c75df8708 release-17.11.1
+548a9ba8c97052fd5dda3faba9ae2e341d289092 release-17.12
+bfc5153d02243ee750035c97029e381a0af26578 release-18.01
+55bb393343226408a330aca14d4270aed217d53c release-18.02
+89dc65b937cc6c04eccb0bfa70cff7408607fb83 release-18.03
+a02b03b7bfec915a89b53ba95a3fb26485561d2b release-18.04
+0daf79d65080a4d8119dc2b9debc54031a9f75cf release-18.05
+df201b9fbad4dade97a9bc12ead6268cf8c5d873 release-18.06
+8aa2d6b96303f20671edf4572eb3c60c37fd0e43 release-18.07
+22a6fc33ab6dd7ee4d812487090161bd89776b78 release-18.08
+7bbc72701f0ace6df46dd7f9e313d33b19f228d9 release-18.09
+ca6d66fee883916904ad231fdd92caf7efe7cbe5 release-18.10
+b4aeb61b3e3c0cdcdd33e02894288bb106ca1d8e release-18.11
+331ac8f99cf8329c9e3a1ef2d2a475328ec089fe release-18.12
+51eefa621de47aac697886f18bcdf257caa725ef release-19.01
+3629d88ae235c300cca1cabe41e2dea70e38444e release-19.02
+dc60316673af5451c7adf41abbadf925498661ce release-19.02.1
+c6dda2cbe0816c2a1e86dd4834b507546ac0983b release-19.03
+d062df8f1d9f3d9994225989bd7903abca8e52e2 release-19.04
+82f703b8b525078707077acb6feb0c2382dab2e9 release-19.05
+d2036d7f5ef6197c5c7714f87bb889b138d95fc5 release-19.06
+a6dbc7c847cbc24735a9388b0f49dc535ef029e5 release-19.07
+4038dc8c58c9b525344c292184c5aaa98caf268f release-19.08
+f434af227a41817f85e3be2eb88c15a30a27edd0 release-19.09
+7eb04391adf788f1455853a71f4fd7565a0b0e5d release-19.10
+cd8ee889589fe07d988d0ead97c61a455929e0e8 release-19.11
+dd3dea7c4d5fde8d3b333b676674c68658036349 release-19.12
--- a/eric6/UI/UserInterface.py	Wed Jan 01 12:00:06 2020 +0100
+++ b/eric6/UI/UserInterface.py	Wed Jan 01 12:01:54 2020 +0100
@@ -644,9 +644,8 @@
         self.inCloseEvent = False
 
         # now redirect stdout and stderr
-        # TODO: release - reenable redirection
-##        sys.stdout = self.stdout
-##        sys.stderr = self.stderr
+        sys.stdout = self.stdout
+        sys.stderr = self.stderr
 
         # now fire up the single application server
         if Preferences.getUI("SingleApplicationMode"):

eric ide

mercurial