From 7705d6020c0e97ae12a715909ee8f9f961caf420 Mon Sep 17 00:00:00 2001
From: Ben Jackson <puremourning@gmail.com>
Date: Sun, 24 May 2020 12:16:04 +0100
Subject: [PATCH] Fix traceback in neovim: vim.vars returns str

---
 python3/vimspector/utils.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/python3/vimspector/utils.py b/python3/vimspector/utils.py
index ac752ac..a12f3dc 100644
--- a/python3/vimspector/utils.py
+++ b/python3/vimspector/utils.py
@@ -566,9 +566,12 @@ def HideSplash( api_prefix, splash ):
 
 
 def GetVimspectorBase():
-  try:
-    return vim.vars[ 'vimspector_base_dir' ].decode( 'utf-8' )
-  except KeyError:
+  base = vim.vars.get( 'vimspector_base_dir' )
+  if base is None:
     return os.path.abspath( os.path.join( os.path.dirname( __file__ ),
                                           '..',
                                           '..' ) )
+  elif isinstance( base, bytes ):
+    return base.decode( 'utf-8' )
+  else:
+    return base