Update 3.4 branch to the latest changes in master #584
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
asenyaev
commented
Nov 11, 2021
setup.py
Outdated
Comment on lines
368
to
378
| # lines for a proper work using pylint and an autocomplete in IDE | ||
| with open("%spython/cv2/__init__.py" | ||
| % cmake_install_dir, 'r') as opencv_init: | ||
| opencv_init_lines = opencv_init.readlines() | ||
| extra_imports = ('\nfrom .cv2 import *\nfrom . import data\n') | ||
| free_line_after_imports = 5 | ||
| opencv_init_lines.insert(free_line_after_imports, extra_imports) | ||
|
|
||
| with open("%spython/cv2/__init__.py" | ||
| % cmake_install_dir, 'w') as opencv_final_init: | ||
| opencv_final_init.writelines(opencv_init_lines) |
There was a problem hiding this comment.
The same logic as in #579, but we have here only two imports.
There was a problem hiding this comment.
os.path.join should be better than string substitution.
There was a problem hiding this comment.
Updated it in the latest commit.
asmorkalov
approved these changes
Nov 12, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Tested in my fork repo: