Merge branch '2.2' of github.com:GNS3/gns3-server into 2.2

gns3server/utils/asyncio/embed_shell.py

@@ -32,8 +32,8 @@ from prompt_toolkit.shortcuts import create_prompt_application, create_asyncio_e
 from prompt_toolkit.terminal.vt100_output import Vt100_Output
 from prompt_toolkit.input import StdinInput
 
-from .telnet_server import AsyncioTelnetServer, TelnetConnection
-from .input_stream import InputStream
+from gns3server.utils.asyncio.telnet_server import AsyncioTelnetServer, TelnetConnection
+from gns3server.utils.asyncio.input_stream import InputStream
 
 
 class EmbedShell:
@@ -344,7 +344,7 @@ if __name__ == '__main__':
                 else:
                     return 'world\n'
 
-            return (await world())
+            return await world()
 
     # Demo using telnet
     shell = Demo(welcome_message="Welcome!\n")

gns3server/utils/images.py

@@ -139,7 +139,7 @@ def images_directories(type):
         paths.append(directory)
     # Compatibility with old topologies we look in parent directory
     paths.append(img_dir)
-    # Return only the existings paths
+    # Return only the existing paths
     return [force_unix_path(p) for p in paths if os.path.exists(p)]