Sat, 03 Jul 2021 11:47:24 +0200
Merged with default branch to prepare release 21.7.
--- a/.hgtags Sat Jul 03 11:44:56 2021 +0200 +++ b/.hgtags Sat Jul 03 11:47:24 2021 +0200 @@ -25,3 +25,66 @@ 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 +028bf21bb5a206025996200f679e8980fcfc43bf release-20.01 +df744f939cca60177de5fb72cc1e74e5c780200c release-20.02 +1148ca40ea36515f46eda72edd90546888d9c4bc release-20.03 +b17672e6812de0d834f94bb0829ae116d9e512a9 release-20.04 +343db73c4842496a29766cf6b9f81560bb7785e8 release-20.05 +dd1054be15aa05e8bfa1f6334964d97d8791118d release-20.06 +72721823d453f80f68afc5b836bd6631d170cc80 release-20.07 +8f53d26009a2728678cddd51095d4d9ff49a6007 release-20.08 +b0e7a833303ba7a3ff6d9576dd3ad6f45f0a359e release-20.09 +5371a22cf2aacb8b1eea8c5a6785e810877060ff release-20.10 +096b3ebc140970b1e174114a6b3ec1f127c23b5a release-20.11 +e64b178499da5368c44fc942fc7707dfbe338067 release-20.12 +2bf9b5ccce4c2fa596fa6b0323132ad11f96ca25 release-20.12.1 +e59e5f2796764b9d77bfc895808078ee9ff7bd8b release-21.01 +0acf98cd089a46f12dcf2ab54f98d35467434255 release-21.02 +f50b338b63cc29f1c015580c63aed1a212de7fe9 release-21.03 +913dd0c49b0336440a9d2d9f8c39d587c29cf77a release-21.04 +698ae46f40a4b4cf74c1329d81cd7bc3bb055977 release-21.05 +b3eefd7e58d1e20667bd5eb6607a8b3d62d94543 release-21.06
--- a/eric6/UI/UserInterface.py Sat Jul 03 11:44:56 2021 +0200 +++ b/eric6/UI/UserInterface.py Sat Jul 03 11:47:24 2021 +0200 @@ -650,9 +650,9 @@ self.inCloseEvent = False # now redirect stdout and stderr - # TODO: release - reenable redirection -## sys.stdout = self.stdout # __IGNORE_WARNING_M891__ -## sys.stderr = self.stderr # __IGNORE_WARNING_M891__ + # + sys.stdout = self.stdout + sys.stderr = self.stderr # now fire up the single application server if Preferences.getUI("SingleApplicationMode"):