feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Save data in UTF-8 by default

Browse Source
This commit is contained in:
Ivan Kravets
2018-03-20 01:14:29 +02:00
parent bbb32607ed
commit ad52f618cf
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
platformio/app.py
View File

@ -107,7 +107,7 @@ class State(object):
def __exit__(self, type_, value, traceback): def __exit__(self, type_, value, traceback):
if self._prev_state != self._state: if self._prev_state != self._state:
try: try:
with codecs.open(self.path, "w") as fp: with codecs.open(self.path, "w", encoding="utf8") as fp:
if "dev" in __version__: if "dev" in __version__:
json.dump(self._state, fp, indent=4) json.dump(self._state, fp, indent=4)
else: else:
@ -188,7 +188,7 @@ class ContentCache(object):
cache_path = self.get_cache_path(key) cache_path = self.get_cache_path(key)
if not isfile(cache_path): if not isfile(cache_path):
return None return None
with codecs.open(cache_path, "rb") as fp: with codecs.open(cache_path, "rb", encoding="utf8") as fp:
return fp.read() return fp.read()
def set(self, key, data, valid): def set(self, key, data, valid):
@ -211,9 +211,9 @@ class ContentCache(object):
if not isdir(dirname(cache_path)): if not isdir(dirname(cache_path)):
os.makedirs(dirname(cache_path)) os.makedirs(dirname(cache_path))
try: try:
with codecs.open(cache_path, "wb") as fp: with codecs.open(cache_path, "wb", encoding="utf8") as fp:
fp.write(data) fp.write(data)
with codecs.open(self._db_path, "a") as fp: with open(self._db_path, "a") as fp:
fp.write("%s=%s\n" % (str(expire_time), cache_path)) fp.write("%s=%s\n" % (str(expire_time), cache_path))
except UnicodeError: except UnicodeError:
if isfile(cache_path): if isfile(cache_path):
@ -235,7 +235,7 @@ class ContentCache(object):
paths_for_delete = [self.get_cache_path(k) for k in keys] paths_for_delete = [self.get_cache_path(k) for k in keys]
found = False found = False
newlines = [] newlines = []
with codecs.open(self._db_path) as fp: with open(self._db_path) as fp:
for line in fp.readlines(): for line in fp.readlines():
if "=" not in line: if "=" not in line:
continue continue
@ -255,7 +255,7 @@ class ContentCache(object):
pass pass
if found and self._lock_dbindex(): if found and self._lock_dbindex():
with codecs.open(self._db_path, "w") as fp: with open(self._db_path, "w") as fp:
fp.write("\n".join(newlines) + "\n") fp.write("\n".join(newlines) + "\n")
self._unlock_dbindex() self._unlock_dbindex()