Skip to content

Issue 312 expand properties in dict unicode error #346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 8, 2018
Merged

Issue 312 expand properties in dict unicode error #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41c40bc
add debug logging when starting session
BlackIkeEagle Apr 8, 2018
076121c
add debug logging to Keymapper
BlackIkeEagle Apr 8, 2018
061b1dc
open the exrc tmp file with ignore errors
BlackIkeEagle Apr 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions pythonx/vdebug/session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
8 changes: 7 additions & 1 deletion pythonx/vdebug/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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))
Expand All @@ -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
Expand All @@ -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

Expand Down