Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit ba1ef82

Browse filesBrowse files
authored
Merge pull request opencv#671 from asenyaev/asen/3.4.18_release
Update 3.4 branch for 3.4.18 release
2 parents 3b795ec + 6521b4b commit ba1ef82
Copy full SHA for ba1ef82

File tree

4 files changed

+3
-13
lines changed
Filter options

4 files changed

+3
-13
lines changed

‎opencv

Copy file name to clipboard
Submodule opencv updated 201 files

‎opencv_contrib

Copy file name to clipboard
Submodule opencv_contrib updated 47 files

‎setup.py

Copy file name to clipboardExpand all lines: setup.py
-10Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -362,16 +362,6 @@ def _classify_installed_files_override(
362362

363363
print("Copying files from CMake output")
364364

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-
375365
# add lines from the old __init__.py file to the config file
376366
with open(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'scripts', '__init__.py'), 'r') as custom_init:
377367
custom_init_data = custom_init.read()

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.