Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2020-12-04 18:25:32 +00:00
parent 22d64ae08f 12a36b5a94
commit 6fdb7aee84
51 changed files with 2880 additions and 112 deletions
@@ -18,6 +18,10 @@ except ImportError:

 def bootstrap():
    import sys
+
+    import copy
+    save_sys_path = copy.copy(sys.path)
+
    if hasattr(sys, 'OpenCV_LOADER'):
        print(sys.path)
        raise ImportError('ERROR: recursion is detected during loading of "cv2" binary extensions. Check OpenCV installation.')
@@ -85,6 +89,8 @@ def bootstrap():
    del sys.modules['cv2']
    import cv2

+    sys.path = save_sys_path  # multiprocessing should start from bootstrap code (https://github.com/opencv/opencv/issues/18502)
+
    try:
        import sys
        del sys.OpenCV_LOADER