mirror of
https://github.com/GNS3/gns3-server
synced 2024-11-13 20:08:55 +00:00
parent
508edf5cc5
commit
4bb990bf0c
@ -127,7 +127,7 @@ class Controller:
|
||||
self.save()
|
||||
with open(self._config_file) as f:
|
||||
data = json.load(f)
|
||||
except (OSError, json.JSONDecodeError) as e:
|
||||
except (OSError, json.decoder.JSONDecodeError) as e:
|
||||
log.critical("Cannot load %s: %s", self._config_file, str(e))
|
||||
return
|
||||
|
||||
|
@ -112,7 +112,7 @@ def load_topology(path):
|
||||
try:
|
||||
with open(path, encoding="utf-8") as f:
|
||||
topo = json.load(f)
|
||||
except (OSError, UnicodeDecodeError, json.JSONDecodeError) as e:
|
||||
except (OSError, UnicodeDecodeError, json.decoder.JSONDecodeError) as e:
|
||||
raise aiohttp.web.HTTPConflict(text="Could not load topology {}: {}".format(path, str(e)))
|
||||
if "revision" not in topo or topo["revision"] < 5:
|
||||
# If it's an old GNS3 file we need to convert it
|
||||
|
Loading…
Reference in New Issue
Block a user