Force encoding to open XML files
The views and icons file should always be encoded in UTF-8, so it is better to force it when opening than relying on the default system. issue5596 review21101002
This commit is contained in:
1 parent
b24c4143a2
commit
c771f0faea
2 files changed
+4
-2
No files matched your search
@@ -50,5 +50,6 @@ class Icon(ModelSQL, ModelView):
|
||||
|
||||
def get_icon(self, name):
|
||||
path = os.path.join(self.module, self.path.replace('/', os.sep))
|
||||
with file_open(path, subdir='modules', mode='r') as fp:
|
||||
with file_open(path,
|
||||
subdir='modules', mode='r', encoding='utf-8') as fp:
|
||||
return fp.read()
|
||||
@@ -193,7 +193,8 @@ class View(ModelSQL, ModelView):
|
||||
if self.name and self.module:
|
||||
path = os.path.join(self.module, 'view', self.name + '.xml')
|
||||
try:
|
||||
with file_open(path, subdir='modules', mode='r') as fp:
|
||||
with file_open(path,
|
||||
subdir='modules', mode='r', encoding='utf-8') as fp:
|
||||
value = fp.read()
|
||||
except IOError:
|
||||
pass
|
||||
|
||||
Reference in new issue
Block a user