Merge branch 'master' into 2.0

gns3server/controller/export_project.py

@@ -43,7 +43,7 @@ def export_project(project, temporary_dir, include_images=False, keep_compute_id
     if project.is_running():
         raise aiohttp.web.HTTPConflict(text="Running topology could not be exported")
 
-    z = zipstream.ZipFile()
+    z = zipstream.ZipFile(allowZip64=True)
 
     # First we process the .gns3 in order to be sure we don't have an error
     for file in os.listdir(project._path):

gns3server/controller/topology.py

@@ -465,7 +465,7 @@ def _convert_snapshots(topo_dir):
 
                 if is_gns3_topo:
                     snapshot_arc = os.path.join(new_snapshots_dir, snapshot + ".gns3project")
-                    with zipfile.ZipFile(snapshot_arc, 'w') as myzip:
+                    with zipfile.ZipFile(snapshot_arc, 'w', allowZip64=True) as myzip:
                         for root, dirs, files in os.walk(snapshot_dir):
                             for file in files:
                                 myzip.write(os.path.join(root, file), os.path.relpath(os.path.join(root, file), snapshot_dir), compress_type=zipfile.ZIP_DEFLATED)