Merge branch '1.5' into 2.0

gns3server/utils/__init__.py

@@ -73,7 +73,7 @@ def parse_version(version):
                 version.append("00000")
             if len(version) == 2:
                 version.append("000000")
-            # We want rc to be at lower level than dev version
+            # We want rc to be at lower level than dev version
             if info == 'rc':
                 info = 'c'
             version.append(info)

gns3server/utils/asyncio/__init__.py

@@ -54,7 +54,7 @@ def subprocess_check_output(*args, cwd=None, env=None):
     if output is None:
         return ""
     # If we received garbage we ignore invalid characters
-    # it should happend only when user try to use another binary
+    # it should happend only when user try to use another binary
     # and the code of VPCS, dynamips... Will detect it's not the correct binary
     return output.decode("utf-8", errors="ignore")
 

gns3server/utils/asyncio/telnet_server.py

@@ -69,7 +69,7 @@ class AsyncioTelnetServer:
 
         self._binary = binary
         # If echo is true when the client send data
-        # the data is echo on his terminal by telnet otherwise
+        # the data is echo on his terminal by telnet otherwise
         # it's our job (or the wrapped app) to send back the data
         self._echo = echo