Commit ba1ef82

authored

Merge pull request #671 from asenyaev/asen/3.4.18_release

Update 3.4 branch for 3.4.18 release

2 parents 3b795ec + 6521b4b commit ba1ef82Copy full SHA for ba1ef82

File tree

-13

lines changed

-13

lines changed

Submodule opencv updated 201 files

Lines changed: 0 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -362,16 +362,6 @@ def _classify_installed_files_override(`
`362`	`362`
`363`	`363`	`print("Copying files from CMake output")`
`364`	`364`
`365`		`- # lines for a proper work using pylint and an autocomplete in IDE`
`366`		`- with open(os.path.join(cmake_install_dir, "python", "cv2", "__init__.py"), 'r') as opencv_init:`
`367`		`- opencv_init_lines = opencv_init.readlines()`
`368`		`- extra_imports = ('\nfrom .cv2 import *\nfrom . import data\nfrom . import version\n')`
`369`		`- free_line_after_imports = 5`
`370`		`- opencv_init_lines.insert(free_line_after_imports, extra_imports)`
`371`		`-`
`372`		`- with open(os.path.join(cmake_install_dir, "python", "cv2", "__init__.py"), 'w') as opencv_final_init:`
`373`		`- opencv_final_init.writelines(opencv_init_lines)`
`374`		`-`
`375`	`365`	`# add lines from the old __init__.py file to the config file`
`376`	`366`	`with open(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'scripts', '__init__.py'), 'r') as custom_init:`
`377`	`367`	`custom_init_data = custom_init.read()`

Comments

(0)