Merge pull request #346 from vim-vdebug/issue-312-expand-properties-in-dict-unicode-error

Issue 312 expand properties in dict unicode error

Author: BlackIkeEagle

pythonx/vdebug/session.py

@@ -112,10 +112,13 @@ def start_if_ready(self):
                   self.__ex_handler.exception_to_string(e))
 
     def __new_session(self):
+        log.Log("create session", log.Logger.DEBUG)
         self.__session = Session(self.__ui, self.__breakpoints,
                                  util.Keymapper())
 
+        log.Log("start session", log.Logger.DEBUG)
         status = self.__session.start(self.listener.create_connection())
+        log.Log("refresh event", log.Logger.DEBUG)
         self.dispatch_event("refresh", status)
 
 

pythonx/vdebug/util.py

@@ -124,6 +124,7 @@ def close_key(self):
         return self.keymaps['close']
 
     def map(self):
+        log.Log("keymapper: map", log.Logger.DEBUG)
         if self.is_mapped:
             return
         self._store_old_map()
@@ -137,14 +138,17 @@ def map(self):
         self.is_mapped = True
 
     def reload(self):
+        log.Log("keymapper: reload", log.Logger.DEBUG)
         self.is_mapped = False
         self.map()
 
     def _reload_keys(self):
+        log.Log("keymapper: reload_keys", log.Logger.DEBUG)
         self.keymaps = vim.eval("g:vdebug_keymap")
         self.leader = vim.eval("g:vdebug_leader_key")
 
     def _store_old_map(self):
+        log.Log("keymapper: store_old_map", log.Logger.DEBUG)
         vim.command('let tempfile=tempname()')
         tempfile = vim.eval("tempfile")
         vim.command('mkexrc! %s' % (tempfile))
@@ -153,7 +157,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 codecs.open(tempfile, 'r', 'cp1250'):
+        for line in codecs.open(tempfile, 'r', errors='ignore'):
+            log.Log("keymapper: line '%s'" % line, log.Logger.DEBUG)
             line = line.encode('utf-8').decode('utf-8')
             if not regex.match(line):
                 continue
@@ -170,6 +175,7 @@ def _store_old_map(self):
         os.remove(tempfile)
 
     def unmap(self):
+        log.Log("keymapper: unmap", log.Logger.DEBUG)
         if self.is_mapped:
             self.is_mapped = False