mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-11-06 15:21:13 +02:00
Replace JSONDecodeError by ValueError (Python 3.4 compatibility)
Fix #847
This commit is contained in:
4 files changed
+4
-4
No files matched your search
@@ -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.decoder.JSONDecodeError) as e:
|
||||
except (OSError, UnicodeDecodeError, ValueError) 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
|
||||
|
||||
Reference in new issue
Block a user