Fix flake8

Author: bstaletic

ycmd/__main__.py

@@ -194,8 +194,6 @@ def Main():
                                     args.stderr,
                                     args.keep_logfiles )
   atexit.register( handlers.ServerCleanup )
-  from bottle import TemplatePlugin
-  handlers.app.uninstall(TemplatePlugin)
   handlers.app.install( WatchdogPlugin( args.idle_suicide_seconds,
                                         args.check_interval_seconds ) )
   handlers.app.install( HmacPlugin( hmac_secret ) )

ycmd/completers/language_server/language_server_completer.py

@@ -2688,7 +2688,8 @@ def InitialHierarchy( self, request_data, args ):
       responses.BuildGoToResponseFromLocation(
         *_LspLocationToLocationAndDescription( request_data, location ) )
       for location in preparation_item ]
-    preparation_item[ 0 ][ 'kind' ] = lsp.SYMBOL_KIND[ preparation_item[ 0 ][ 'kind' ] ]
+    kind_string = lsp.SYMBOL_KIND[ preparation_item[ 0 ][ 'kind' ] ]
+    preparation_item[ 0 ][ 'kind' ] = kind_string
     return preparation_item
 
 
@@ -2704,7 +2705,8 @@ def Hierarchy( self, request_data, args ):
       preparation_item = preparation_item[ name_and_kind_key ]
     else:
       del preparation_item[ 'locations' ]
-      preparation_item[ 'kind' ] = lsp.SYMBOL_KIND.index( preparation_item[ 'kind' ] )
+      kind_number = lsp.SYMBOL_KIND.index( preparation_item[ 'kind' ] )
+      preparation_item[ 'kind' ] = kind_number
 
     if kind == 'call':
       direction += 'Calls'
@@ -2720,7 +2722,8 @@ def Hierarchy( self, request_data, args ):
       for item in result:
         if kind == 'call':
           name_and_kind_key = 'to' if direction == 'outgoing' else 'from'
-          item[ 'kind' ] = lsp.SYMBOL_KIND[ item[ name_and_kind_key ][ 'kind' ] ]
+          kind_string = lsp.SYMBOL_KIND[ item[ name_and_kind_key ][ 'kind' ] ]
+          item[ 'kind' ] = kind_string
           item[ 'name' ] = item[ name_and_kind_key ][ 'name' ]
           lsp_locations = [ {
             'uri': item[ name_and_kind_key ][ 'uri' ],