Merge pull request #10630 from viesti/viesti-master

Use codecs module while reading & writing json cache file
This commit is contained in:
Toshio Kuratomi 2015-04-09 10:36:43 -07:00
commit c75baaa140

View file

@ -18,6 +18,7 @@
import os import os
import time import time
import errno import errno
import codecs
try: try:
import simplejson as json import simplejson as json
@ -57,7 +58,7 @@ class CacheModule(BaseCacheModule):
cachefile = "%s/%s" % (self._cache_dir, key) cachefile = "%s/%s" % (self._cache_dir, key)
try: try:
f = open( cachefile, 'r') f = codecs.open(cachefile, 'r', encoding='utf-8')
except (OSError,IOError), e: except (OSError,IOError), e:
utils.warning("error while trying to write to %s : %s" % (cachefile, str(e))) utils.warning("error while trying to write to %s : %s" % (cachefile, str(e)))
else: else:
@ -73,7 +74,7 @@ class CacheModule(BaseCacheModule):
cachefile = "%s/%s" % (self._cache_dir, key) cachefile = "%s/%s" % (self._cache_dir, key)
try: try:
f = open(cachefile, 'w') f = codecs.open(cachefile, 'w', encoding='utf-8')
except (OSError,IOError), e: except (OSError,IOError), e:
utils.warning("error while trying to read %s : %s" % (cachefile, str(e))) utils.warning("error while trying to read %s : %s" % (cachefile, str(e)))
else: else: