From 05ea3e6d8f3acf762b9a25aba4bfdcff8e0a5fce Mon Sep 17 00:00:00 2001
From: BlackEagle <ike.devolder@gmail.com>
Date: Fri, 30 Mar 2018 13:42:21 +0200
Subject: [PATCH 1/4] make sure temp keymap is read in correct encoding

Apperantly mkexrc stores a file with cp1250 encoding, when re-reading
the file and trying to use it as utf-8 you get errors. So no we read the
file with the cp1250 encoding and transfer the data back to utf-8. This
avoids a supressed crash when a debugger connects to vdebug and there
are utf-8 chars in the configuration that get misinterpreted because the
faulty exported data.

fixes #337

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
---
 pythonx/vdebug/util.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pythonx/vdebug/util.py b/pythonx/vdebug/util.py
index 2476889d..7573e21c 100644
--- a/pythonx/vdebug/util.py
+++ b/pythonx/vdebug/util.py
@@ -6,6 +6,7 @@
 import sys
 import time
 import traceback
+import codecs
 try:
     import urllib.parse as urllib
 except ImportError:
@@ -153,7 +154,8 @@ def _store_old_map(self):
         keys = {v for k, v in self.keymaps.items() if k not in self.exclude}
         special = {"<buffer>", "<silent>", "<special>", "<script>", "<expr>",
                    "<unique>"}
-        for line in open(tempfile, 'r'):
+        for line in codecs.open(tempfile, 'r', 'cp1250'):
+            line = line.encode('utf-8').decode('utf-8')
             if not regex.match(line):
                 continue
             parts = split_regex.split(line)[1:]

From fc68a4763949c7e0b99e4e027cf7946cde567387 Mon Sep 17 00:00:00 2001
From: BlackEagle <ike.devolder@gmail.com>
Date: Fri, 30 Mar 2018 13:47:39 +0200
Subject: [PATCH 2/4] add additional logging why the debugger is stopped

This might come in handy while debugging vdebug.

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
---
 pythonx/vdebug/event.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pythonx/vdebug/event.py b/pythonx/vdebug/event.py
index 21f45ecd..67b90544 100644
--- a/pythonx/vdebug/event.py
+++ b/pythonx/vdebug/event.py
@@ -262,12 +262,12 @@ def run(self, status):
         if str(status) == "interactive":
             self.ui.error("Debugger engine says it is in interactive mode,"
                           "which is not supported: closing connection")
-            #self.__breakpoints.unlink_api()
+            log.Log("closing connection because of interactive mode")
             self.session.close_connection()
         elif str(status) in ("stopping", "stopped"):
             self.ui.set_status("stopped")
             self.ui.say("Debugging session has ended")
-            #self.__breakpoints.unlink_api()
+            log.Log("closing connection because status is stopped")
             self.session.close_connection(False)
             if opts.Options.get('continuous_mode', int) != 0:
                 self.dispatch("listen")

From 48a4f0dcbbf290b7071b22eb7028177967776460 Mon Sep 17 00:00:00 2001
From: BlackEagle <ike.devolder@gmail.com>
Date: Fri, 30 Mar 2018 13:52:02 +0200
Subject: [PATCH 3/4] remove duplicate _reload_keys in util

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
---
 pythonx/vdebug/util.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pythonx/vdebug/util.py b/pythonx/vdebug/util.py
index 7573e21c..c4fb89c8 100644
--- a/pythonx/vdebug/util.py
+++ b/pythonx/vdebug/util.py
@@ -138,7 +138,6 @@ def map(self):
 
     def reload(self):
         self.is_mapped = False
-        self._reload_keys()
         self.map()
 
     def _reload_keys(self):

From 1fd02ad8542bd1ed4aded0954350e16945179bde Mon Sep 17 00:00:00 2001
From: BlackEagle <ike.devolder@gmail.com>
Date: Fri, 30 Mar 2018 13:55:37 +0200
Subject: [PATCH 4/4] remove some notifications from util

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
---
 pythonx/vdebug/util.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pythonx/vdebug/util.py b/pythonx/vdebug/util.py
index c4fb89c8..7dac94eb 100644
--- a/pythonx/vdebug/util.py
+++ b/pythonx/vdebug/util.py
@@ -50,7 +50,9 @@ def handle_interrupt(self):
     def handle_socket_end(self):
         """Handle a socket closing, which is pretty normal.
         """
-        self._session_handler.ui().say("Connection to the debugger has been closed")
+        self._session_handler.ui().say(
+            "Connection to the debugger has been closed"
+        )
         self._session_handler.stop()
 
     def handle_vim_error(self, e):
@@ -85,7 +87,7 @@ def handle(self, e):
         elif isinstance(e, error.UserInterrupt):
             try:
                 self.handle_interrupt()
-            except:
+            except Exception as e:
                 pass
         elif isinstance(e, self.readable_errors):
             self.handle_readable_error(e)
@@ -97,12 +99,10 @@ def handle(self, e):
             print("Keyboard interrupt - debugging session cancelled")
             try:
                 self._session_handler.stop()
-            except:
+            except Exception as e:
                 pass
         else:
             self.handle_general_exception()
-        #elif isinstance(e,vim.error):
-        #    self.handle_vim_error(e)
 
 
 class Keymapper:
@@ -259,7 +259,9 @@ def _create_remote(f):
                     elif remote.endswith('/') and not local.endswith('/'):
                         remote = remote[:-1]
                     ret = ret.replace(local, remote, 1)
-                    # replace remaining local separators with URL '/' separators
+                    """
+                    replace remaining local separators with URL '/' separators
+                    """
                     ret = ret.replace('\\', '/')
                     break
 
@@ -350,5 +352,5 @@ def probe():
         try:
             vim.eval("getchar(0)")
             time.sleep(0.1)
-        except:  # vim.error
+        except vim.error as e:
             raise error.UserInterrupt()