From f7aa5fa6b6abef950c3f5557bd40e9f3086bfa55 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Tue, 18 Apr 2017 13:05:48 +0200 Subject: [PATCH] TT#14571 PEP8 for YouCompleteMe config Change-Id: I8fdc9b3d3ceb2cfa7333cb8520228629f1c521f1 --- daemon/.ycm_extra_conf.py | 151 ++++++++++++++-------------- recording-daemon/.ycm_extra_conf.py | 147 +++++++++++++-------------- 2 files changed, 150 insertions(+), 148 deletions(-) diff --git a/daemon/.ycm_extra_conf.py b/daemon/.ycm_extra_conf.py index a58ab6aec..06920119c 100644 --- a/daemon/.ycm_extra_conf.py +++ b/daemon/.ycm_extra_conf.py @@ -12,94 +12,95 @@ compilation_database_folder = '' # These are the compilation flags that will be used in case there's no # compilation database set. flags = [ -'-g', -'-Wall', -'-pthread', -'-fno-strict-aliasing', -'-I/usr/include/glib-2.0', -'-I/usr/lib/x86_64-linux-gnu/glib-2.0/include', -'-pthread', -'-I../kernel-module/', -'-D_GNU_SOURCE', -'-D__DEBUG=1', -'-D__YCM=1', -'-DRTPENGINE_VERSION="dummy"', -'-DRE_PLUGIN_DIR="/usr/lib/rtpengine"', -'-O2', -'-fstack-protector', -'--param=ssp-buffer-size=4', -'-Wformat', -'-Werror=format-security', -'-D_FORTIFY_SOURCE=2', -# THIS IS IMPORTANT! Without a "-std=" flag, clang won't know which -# language to use when compiling headers. So it will guess. Badly. So C++ -# headers will be compiled as C headers. You don't want that so ALWAYS specify -# a "-std=". -# For a C project, you would set this to something like 'c99' instead of -# 'c++11'. -'-std=c99', -# ...and the same thing goes for the magic -x option which specifies the -# language that the files to be compiled are written in. This is mostly -# relevant for c++ headers. -# For a C project, you would set this to 'c' instead of 'c++'. -'-x', -'c', + '-g', + '-Wall', + '-pthread', + '-fno-strict-aliasing', + '-I/usr/include/glib-2.0', + '-I/usr/lib/x86_64-linux-gnu/glib-2.0/include', + '-pthread', + '-I../kernel-module/', + '-D_GNU_SOURCE', + '-D__DEBUG=1', + '-D__YCM=1', + '-DRTPENGINE_VERSION="dummy"', + '-DRE_PLUGIN_DIR="/usr/lib/rtpengine"', + '-O2', + '-fstack-protector', + '--param=ssp-buffer-size=4', + '-Wformat', + '-Werror=format-security', + '-D_FORTIFY_SOURCE=2', + # THIS IS IMPORTANT! Without a "-std=" flag, clang won't + # know which language to use when compiling headers. So it will guess. + # Badly. So C++ headers will be compiled as C headers. + # You don't want that so ALWAYS specify + # a "-std=". + # For a C project, you would set this to something like 'c99' instead of + # 'c++11'. + '-std=c99', + # ...and the same thing goes for the magic -x option which specifies the + # language that the files to be compiled are written in. This is mostly + # relevant for c++ headers. + # For a C project, you would set this to 'c' instead of 'c++'. + '-x', + 'c', ] if compilation_database_folder: - database = ycm_core.CompilationDatabase( compilation_database_folder ) + database = ycm_core.CompilationDatabase(compilation_database_folder) else: - database = None + database = None def DirectoryOfThisScript(): - return os.path.dirname( os.path.abspath( __file__ ) ) + return os.path.dirname(os.path.abspath(__file__)) -def MakeRelativePathsInFlagsAbsolute( flags, working_directory ): - if not working_directory: - return flags - new_flags = [] - make_next_absolute = False - path_flags = [ '-isystem', '-I', '-iquote', '--sysroot=' ] - for flag in flags: - new_flag = flag +def MakeRelativePathsInFlagsAbsolute(flags, working_directory): + if not working_directory: + return flags + new_flags = [] + make_next_absolute = False + path_flags = ['-isystem', '-I', '-iquote', '--sysroot='] + for flag in flags: + new_flag = flag - if make_next_absolute: - make_next_absolute = False - if not flag.startswith( '/' ): - new_flag = os.path.join( working_directory, flag ) + if make_next_absolute: + make_next_absolute = False + if not flag.startswith('/'): + new_flag = os.path.join(working_directory, flag) - for path_flag in path_flags: - if flag == path_flag: - make_next_absolute = True - break + for path_flag in path_flags: + if flag == path_flag: + make_next_absolute = True + break - if flag.startswith( path_flag ): - path = flag[ len( path_flag ): ] - new_flag = path_flag + os.path.join( working_directory, path ) - break + if flag.startswith(path_flag): + path = flag[len(path_flag):] + new_flag = path_flag + os.path.join(working_directory, path) + break - if new_flag: - new_flags.append( new_flag ) - return new_flags + if new_flag: + new_flags.append(new_flag) + return new_flags -def FlagsForFile( filename ): - if database: - # Bear in mind that compilation_info.compiler_flags_ does NOT return a - # python list, but a "list-like" StringVec object - compilation_info = database.GetCompilationInfoForFile( filename ) - final_flags = PrepareClangFlags( - MakeRelativePathsInFlagsAbsolute( - compilation_info.compiler_flags_, - compilation_info.compiler_working_dir_ ), - filename ) - else: - relative_to = DirectoryOfThisScript() - final_flags = MakeRelativePathsInFlagsAbsolute( flags, relative_to ) +def FlagsForFile(filename): + if database: + # Bear in mind that compilation_info.compiler_flags_ does NOT return a + # python list, but a "list-like" StringVec object + compilation_info = database.GetCompilationInfoForFile(filename) + final_flags = PrepareClangFlags( + MakeRelativePathsInFlagsAbsolute( + compilation_info.compiler_flags_, + compilation_info.compiler_working_dir_), + filename) + else: + relative_to = DirectoryOfThisScript() + final_flags = MakeRelativePathsInFlagsAbsolute(flags, relative_to) - return { - 'flags': final_flags, - 'do_cache': True - } + return { + 'flags': final_flags, + 'do_cache': True + } diff --git a/recording-daemon/.ycm_extra_conf.py b/recording-daemon/.ycm_extra_conf.py index 0d613498b..64842e9e0 100644 --- a/recording-daemon/.ycm_extra_conf.py +++ b/recording-daemon/.ycm_extra_conf.py @@ -12,92 +12,93 @@ compilation_database_folder = '' # These are the compilation flags that will be used in case there's no # compilation database set. flags = [ -'-g', -'-Wall', -'-pthread', -'-fno-strict-aliasing', -'-I/usr/include/glib-2.0', -'-I/usr/lib/x86_64-linux-gnu/glib-2.0/include', -'-I../lib/', -'-pthread', -'-D_GNU_SOURCE', -'-D__DEBUG=1', -'-D__YCM=1', -'-O2', -'-fstack-protector', -'--param=ssp-buffer-size=4', -'-Wformat', -'-Werror=format-security', -'-D_FORTIFY_SOURCE=2', -# THIS IS IMPORTANT! Without a "-std=" flag, clang won't know which -# language to use when compiling headers. So it will guess. Badly. So C++ -# headers will be compiled as C headers. You don't want that so ALWAYS specify -# a "-std=". -# For a C project, you would set this to something like 'c99' instead of -# 'c++11'. -'-std=c99', -# ...and the same thing goes for the magic -x option which specifies the -# language that the files to be compiled are written in. This is mostly -# relevant for c++ headers. -# For a C project, you would set this to 'c' instead of 'c++'. -'-x', -'c', + '-g', + '-Wall', + '-pthread', + '-fno-strict-aliasing', + '-I/usr/include/glib-2.0', + '-I/usr/lib/x86_64-linux-gnu/glib-2.0/include', + '-I../lib/', + '-pthread', + '-D_GNU_SOURCE', + '-D__DEBUG=1', + '-D__YCM=1', + '-O2', + '-fstack-protector', + '--param=ssp-buffer-size=4', + '-Wformat', + '-Werror=format-security', + '-D_FORTIFY_SOURCE=2', + # THIS IS IMPORTANT! Without a "-std=" flag, clang won't + # know which language to use when compiling headers. So it will guess. + # Badly. So C++ headers will be compiled as C headers. + # You don't want that so ALWAYS specify + # a "-std=". + # For a C project, you would set this to something like 'c99' instead of + # 'c++11'. + '-std=c99', + # ...and the same thing goes for the magic -x option which specifies the + # language that the files to be compiled are written in. This is mostly + # relevant for c++ headers. + # For a C project, you would set this to 'c' instead of 'c++'. + '-x', + 'c', ] if compilation_database_folder: - database = ycm_core.CompilationDatabase( compilation_database_folder ) + database = ycm_core.CompilationDatabase(compilation_database_folder) else: - database = None + database = None def DirectoryOfThisScript(): - return os.path.dirname( os.path.abspath( __file__ ) ) + return os.path.dirname(os.path.abspath(__file__)) -def MakeRelativePathsInFlagsAbsolute( flags, working_directory ): - if not working_directory: - return flags - new_flags = [] - make_next_absolute = False - path_flags = [ '-isystem', '-I', '-iquote', '--sysroot=' ] - for flag in flags: - new_flag = flag +def MakeRelativePathsInFlagsAbsolute(flags, working_directory): + if not working_directory: + return flags + new_flags = [] + make_next_absolute = False + path_flags = ['-isystem', '-I', '-iquote', '--sysroot='] + for flag in flags: + new_flag = flag - if make_next_absolute: - make_next_absolute = False - if not flag.startswith( '/' ): - new_flag = os.path.join( working_directory, flag ) + if make_next_absolute: + make_next_absolute = False + if not flag.startswith('/'): + new_flag = os.path.join(working_directory, flag) - for path_flag in path_flags: - if flag == path_flag: - make_next_absolute = True - break + for path_flag in path_flags: + if flag == path_flag: + make_next_absolute = True + break - if flag.startswith( path_flag ): - path = flag[ len( path_flag ): ] - new_flag = path_flag + os.path.join( working_directory, path ) - break + if flag.startswith(path_flag): + path = flag[len(path_flag):] + new_flag = path_flag + os.path.join(working_directory, path) + break - if new_flag: - new_flags.append( new_flag ) - return new_flags + if new_flag: + new_flags.append(new_flag) + return new_flags -def FlagsForFile( filename ): - if database: - # Bear in mind that compilation_info.compiler_flags_ does NOT return a - # python list, but a "list-like" StringVec object - compilation_info = database.GetCompilationInfoForFile( filename ) - final_flags = PrepareClangFlags( - MakeRelativePathsInFlagsAbsolute( - compilation_info.compiler_flags_, - compilation_info.compiler_working_dir_ ), - filename ) - else: - relative_to = DirectoryOfThisScript() - final_flags = MakeRelativePathsInFlagsAbsolute( flags, relative_to ) +def FlagsForFile(filename): + if database: + # Bear in mind that compilation_info.compiler_flags_ does NOT return a + # python list, but a "list-like" StringVec object + compilation_info = database.GetCompilationInfoForFile(filename) + final_flags = PrepareClangFlags( + MakeRelativePathsInFlagsAbsolute( + compilation_info.compiler_flags_, + compilation_info.compiler_working_dir_), + filename) + else: + relative_to = DirectoryOfThisScript() + final_flags = MakeRelativePathsInFlagsAbsolute(flags, relative_to) - return { - 'flags': final_flags, - 'do_cache': True - } + return { + 'flags': final_flags, + 'do_cache': True + }