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

Update 3.4 branch for 3.4.18 release

opencv @ a3d08823

-Subproject commit 631126c77ade2428cc82aced42bdc4166ac2e817
+Subproject commit a3d088231745d147681d90579ef6e5380d7e5cb5

opencv_contrib @ 0eda296f

-Subproject commit e0db5fde1d4f688f9cab3d33862cfcf561bd754e
+Subproject commit 0eda296f4038ae058d76e2d828da8d0e7991cf85

opencv_extra @ 5bad5827

-Subproject commit b2e7c8ac8fedbce149c4b98ca8c087f1a5dfd5e2
+Subproject commit 5bad58277b230294a76a5204d5a476db2c9b2132

setup.py

@@ -362,16 +362,6 @@ class RearrangeCMakeOutput(object):
 
         print("Copying files from CMake output")
 
-        # lines for a proper work using pylint and an autocomplete in IDE
-        with open(os.path.join(cmake_install_dir, "python", "cv2", "__init__.py"), 'r') as opencv_init:
-            opencv_init_lines = opencv_init.readlines()
-            extra_imports = ('\nfrom .cv2 import *\nfrom . import data\nfrom . import version\n')
-            free_line_after_imports = 5
-            opencv_init_lines.insert(free_line_after_imports, extra_imports)
-
-        with open(os.path.join(cmake_install_dir, "python", "cv2", "__init__.py"), 'w') as opencv_final_init:
-            opencv_final_init.writelines(opencv_init_lines)
-
         # add lines from the old __init__.py file to the config file
         with open(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'scripts', '__init__.py'), 'r') as custom_init:
             custom_init_data = custom_init.read()