1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-13 20:08:55 +00:00

Merge branch 'master' into 2.0

This commit is contained in:
Julien Duponchelle 2016-07-28 15:05:21 +02:00
commit 0c3a2c660a
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
3 changed files with 7 additions and 3 deletions

View File

@ -384,7 +384,8 @@ class ProjectHandler:
response.content_length = None
response.start(request)
for data in project.export(include_images=bool(request.GET.get("include_images", "0"))):
include_images = bool(int(request.json.get("include_images", "0")))
for data in project.export(include_images=include_images):
response.write(data)
yield from response.drain()

View File

@ -91,7 +91,8 @@ def md5sum(path):
try:
with open(path + '.md5sum') as f:
return f.read()
except OSError:
# Unicode error is when user rename an image to .md5sum ....
except (OSError, UnicodeDecodeError):
pass
try:

View File

@ -17,12 +17,14 @@
import sys
import json
import jsonschema
import urllib
import asyncio
import aiohttp
import logging
import urllib
import traceback
import jsonschema
log = logging.getLogger(__name__)