Skip to content

Fixed both utf-8 issue and non-existent objects #12

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

Open
TruePath wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed both utf-8 issue and non-existent objects #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 10 additions & 9 deletions boundkeys.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import json
import re
import collections

import sys

class BoundKeysCommand(sublime_plugin.TextCommand):
def removeComments(self, text):
Expand Down Expand Up @@ -233,7 +233,7 @@ def run(self, edit):
continue
zip = zipfile.ZipFile(fullPath, "r")
jsonObj = self.jsonify(
str(zip.open(fileZipPath, "r").read(), "utf-8")
str(zip.open(fileZipPath, "r").read(), sys.getfilesystemencoding())
)
zip.close()
except IOError:
Expand Down Expand Up @@ -301,12 +301,13 @@ def run(self, edit):
jsonObj = self.jsonify(
str(zip.open(zipName, "r").read(), "utf-8")
)
userKeys[lastPath] = {}
userKeys[lastPath]["name"] = name
userKeys[lastPath]["loc_key"] = pathName
userKeys[lastPath]["object"] = jsonObj
userKeys[lastPath]["path"] = fullPath
userKeys[lastPath]["zipName"] = zipName
if jsonObj:
userKeys[lastPath] = {}
userKeys[lastPath]["name"] = name
userKeys[lastPath]["loc_key"] = pathName
userKeys[lastPath]["object"] = jsonObj
userKeys[lastPath]["path"] = fullPath
userKeys[lastPath]["zipName"] = zipName
zip.close()
except IOError:
print("File not found: %s" % fullPath)
Expand All @@ -333,7 +334,7 @@ def run(self, edit):
if lastPath in subKeys or lastPath in userKeys:
continue
try:
jsonObj = self.jsonify(open(filePath, "r").read())
jsonObj = self.jsonify(open(filePath, "r", encoding='utf-8').read())
except IOError:
errorLoading.append(filePath)
if jsonObj:
Expand Down