Skip to content
Snippets Groups Projects
Commit ac6ee861 authored by Mohamed, Fawzi Roberto (fawzi)'s avatar Mohamed, Fawzi Roberto (fawzi)
Browse files

use utf-8 to load metainfo deps

required to use non ascii chars in meta info with python3.5
parent a6adc489
No related branches found
No related tags found
No related merge requests found
...@@ -195,7 +195,7 @@ class RelativeDependencySolver(object): ...@@ -195,7 +195,7 @@ class RelativeDependencySolver(object):
depInfo = None depInfo = None
depIKEnv = InfoKindEnv(path = dPath, dependencyLoader=infoKindEnv.dependencyLoader) depIKEnv = InfoKindEnv(path = dPath, dependencyLoader=infoKindEnv.dependencyLoader)
self.deps[dPath] = depIKEnv self.deps[dPath] = depIKEnv
with open(dPath) as f: with open(dPath, encoding="utf-8") as f:
try: try:
depInfo = json.load(f) depInfo = json.load(f)
except: except:
...@@ -646,7 +646,7 @@ class InfoKindEnv(object): ...@@ -646,7 +646,7 @@ class InfoKindEnv(object):
def loadJsonFile(filePath, dependencyLoader = None, extraArgsHandling = InfoKindEl.ADD_EXTRA_ARGS, uri = None): def loadJsonFile(filePath, dependencyLoader = None, extraArgsHandling = InfoKindEl.ADD_EXTRA_ARGS, uri = None):
env = InfoKindEnv(dependencyLoader = dependencyLoader, path = filePath, uri = uri) env = InfoKindEnv(dependencyLoader = dependencyLoader, path = filePath, uri = uri)
try: try:
with open(filePath) as f: with open(filePath, encoding="utf-8") as f:
o = json.load(f) o = json.load(f)
warnings = env.fromJsonList(o, name = os.path.basename(filePath), source = {'path': filePath}, extraArgsHandling = extraArgsHandling) warnings = env.fromJsonList(o, name = os.path.basename(filePath), source = {'path': filePath}, extraArgsHandling = extraArgsHandling)
except: except:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment