Merged with changes done on my Raspberry Pi 4. eric7

Fri, 23 Sep 2022 13:43:06 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Fri, 23 Sep 2022 13:43:06 +0200
branch
eric7
changeset 9349
df34d520c63b
parent 9348
f61d71d95cb1 (diff)
parent 9347
da982d5b0718 (current diff)
child 9350
8d2b507f8588

Merged with changes done on my Raspberry Pi 4.

--- a/src/eric7/CodeFormatting/BlackFormattingDialog.py	Fri Sep 23 11:47:42 2022 +0200
+++ b/src/eric7/CodeFormatting/BlackFormattingDialog.py	Fri Sep 23 13:43:06 2022 +0200
@@ -345,15 +345,11 @@
             taskQueue.put("STOP")
 
         for worker in workers:
-            worker.join(2)  # 2 seconds timeout just in case
-            # TODO: monitor this change
-            if worker.exitcode is None:
-                worker.terminate()
+            worker.join()
             worker.close()
 
         taskQueue.close()
-        ##        doneQueue.close()
-        # TODO: monitor this change
+        doneQueue.close()
 
         self.__finish()
 
--- a/src/eric7/Utilities/BackgroundClient.py	Fri Sep 23 11:47:42 2022 +0200
+++ b/src/eric7/Utilities/BackgroundClient.py	Fri Sep 23 13:43:06 2022 +0200
@@ -9,14 +9,15 @@
 checkers and other python interpreter dependent functions.
 """
 
+import contextlib
 import io
 import json
+import multiprocessing
 import socket
 import struct
 import sys
 import time
 import traceback
-import contextlib
 from zlib import adler32
 
 
@@ -234,6 +235,8 @@
         )
         sys.exit(1)
 
+    multiprocessing.set_start_method("spawn")
+
     host, port, maxProcs, pyLibraryPath = sys.argv[1:]
 
     # insert pyLibraryPath into the search path because external stuff might
--- a/src/eric7/eric7.py	Fri Sep 23 11:47:42 2022 +0200
+++ b/src/eric7/eric7.py	Fri Sep 23 13:43:06 2022 +0200
@@ -14,6 +14,7 @@
 import contextlib
 import io
 import logging
+import multiprocessing
 import os
 import sys
 import traceback
@@ -238,6 +239,7 @@
     global app, args, mainWindow, splash, restartArgs, inMainLoop
 
     sys.excepthook = excepthook
+    multiprocessing.set_start_method("spawn")
 
     from PyQt6.QtGui import QGuiApplication
 

eric ide

mercurial