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

This commit is contained in:
Alexander Alekhin committed 2019-06-21 17:27:14 +03:00
commit f33f88de31
10 files changed
+28 -7

No files matched your search

+1 -1
View File
@@ -39,7 +39,7 @@ def bootstrap():
l_vars = locals()
if sys.version_info[:2] < (3, 0):
from cv2.load_config_py2 import exec_file_wrapper
from . load_config_py2 import exec_file_wrapper
else:
from . load_config_py3 import exec_file_wrapper