Merge branch '1.5' into 2.0

gns3server/handlers/api/compute/project_handler.py

@@ -233,7 +233,7 @@ class ProjectHandler:
         :returns: hash
         """
         stats = {}
-        # Non blocking call in order to get cpu usage. First call will return 0.
+        # Non blocking call in order to get cpu usage. First call will return 0
         stats["cpu_usage_percent"] = psutil.cpu_percent(interval=None)
         stats["memory_usage_percent"] = psutil.virtual_memory().percent
         return {"action": "ping", "event": stats}
@@ -275,7 +275,11 @@ class ProjectHandler:
         path = request.match_info["path"]
         path = os.path.normpath(path)
 
+<< << << < HEAD: gns3server / handlers / api / compute / project_handler.py
         # Raise an error if user try to escape
+== == == =
+        # Raise error if user try to escape
+>>>>>> > 1.5: gns3server / handlers / api / project_handler.py
         if path[0] == ".":
             raise aiohttp.web.HTTPForbidden
         path = os.path.join(project.path, path)
@@ -362,7 +366,7 @@ class ProjectHandler:
         path = request.match_info["path"]
         path = os.path.normpath(path)
 
-        # Raise error if user try to escape
+        # Raise error if user try to escape
         if path[0] == ".":
             raise aiohttp.web.HTTPForbidden
         path = os.path.join(project.path, path)
@@ -428,9 +432,17 @@ class ProjectHandler:
         project_id = request.match_info["project_id"]
         project = pm.create_project(project_id=project_id)
 
+<<<<<<< HEAD:gns3server/handlers/api/compute/project_handler.py
         # We write the content to a temporary location and after we extract it all.
         # It could be more optimal to stream this but it is not implemented in Python.
         # Spooled means the file is temporary kept in memory until max_size is reached
+=======
+        # We write the content to a temporary location
+        # and after extract all. It could be more optimal to stream
+        # this but it's not implemented in Python.
+        #
+        # Spooled mean the file is temporary keep in ram until max_size
+>>>>>>> 1.5:gns3server/handlers/api/project_handler.py
         try:
             with tempfile.SpooledTemporaryFile(max_size=10000) as temp:
                 while True: