potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 07:13:02 +04:00
Code Packages Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexander Alekhin
2022-08-14 15:50:42 +00:00
parent d09cc0f30c cc8add9f66
commit 2ebdc04787
37 changed files with 246 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/python/package/cv2/__init__.py
+1 -1
View File
@@ -89,7 +89,7 @@ def bootstrap():
BINARIES_PATHS = []
g_vars = globals()
l_vars = locals()
l_vars = locals().copy()
if sys.version_info[:2] < (3, 0):
from . load_config_py2 import exec_file_wrapper