Re-release v2.1.3 to fix idna packaging issue.

CHANGELOG

@@ -1,5 +1,14 @@
 # Change Log
 
+## 2.1.3 19/01/2018
+
+* Change messages when there are different client and server versions. Fixes #2391.
+* Fix "Transport selection via DSN is deprecated" message. Sync is configured with HTTPTransport.
+* Refresh CPU/RAM info every 1 second. Ref #2262.
+* Only check for AVG on Windows
+* Improve the search for VBoxManage.
+* Allow telnet console to node with name containing double quotes. Fixes #2371.
+
 ## 2.1.2 08/01/2018
 
 * Update VMware promotion in setup wizard.

Dockerfile

@@ -1,12 +1,12 @@
 # Run tests inside a container
-FROM ubuntu:yakkety
+FROM ubuntu:17.10
 
 MAINTAINER GNS3 Team
 
 #ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update
-RUN apt-get install -y --force-yes python3.5 python3-pyqt5 python3-pip python3-pyqt5.qtsvg python3-pyqt5.qtwebsockets python3.5-dev xvfb
+RUN apt-get install -y --force-yes python3.6 python3-pyqt5 python3-pip python3-pyqt5.qtsvg python3-pyqt5.qtwebsockets python3.6-dev xvfb
 RUN apt-get clean
 
 
@@ -19,4 +19,4 @@ ADD . /src
 
 WORKDIR /src
 
-CMD xvfb-run python3.5 -m pytest -vv
+CMD xvfb-run python3.6 -m pytest -vv

gns3/compute_manager.py

@@ -55,7 +55,7 @@ class ComputeManager(QtCore.QObject):
     def _refreshComputesSlot(self):
         if self._refreshingComputes:
             return
-        if self._controller.connected() and datetime.datetime.now().timestamp() - self._last_computes_refresh > 5:
+        if self._controller.connected() and datetime.datetime.now().timestamp() - self._last_computes_refresh > 1:
             self._last_computes_refresh = datetime.datetime.now().timestamp()
             self._refreshingComputes = True
             self._controller.get("/computes", self._listComputesCallback, showProgress=False, timeout=30)
@@ -84,6 +84,7 @@ class ComputeManager(QtCore.QObject):
         Called when we received data from a compute
         node.
         """
+
         self._last_computes_refresh = datetime.datetime.now().timestamp()
 
         new_node = False

gns3/crash_report.py

@@ -51,7 +51,7 @@ class CrashReport:
     Report crash to a third party service
     """
 
-    DSN = "sync+https://5e56cf6924c94ad594e040a66735b112:3103c4e6e6564d68ab7623e9911b4db2@sentry.io/38506"
+    DSN = "sync+https://9a23499382c64b82bfc707a3716bd0b1:6ad6c81972af4b12837ca4d1895eac8b@sentry.io/38506"
     if hasattr(sys, "frozen"):
         cacert = get_resource("cacert.pem")
         if cacert is not None and os.path.isfile(cacert):

gns3/dialogs/doctor_dialog.py

@@ -95,13 +95,14 @@ class DoctorDialog(QtWidgets.QDialog, Ui_DoctorDialog):
     def checkAVGInstalled(self):
         """Checking if AVG software is not installed"""
 
-        for proc in psutil.process_iter():
-            try:
-                psinfo = proc.as_dict(["exe"])
-                if psinfo["exe"] and "AVG\\" in psinfo["exe"]:
-                    return (2, "AVG has known issues with GNS3, even after you disable it. You must whitelist dynamips.exe in the AVG preferences.")
-            except psutil.NoSuchProcess:
-                pass
+        if sys.platform.startswith("win32"):
+            for proc in psutil.process_iter():
+                try:
+                    psinfo = proc.as_dict(["exe"])
+                    if psinfo["exe"] and "AVG\\" in psinfo["exe"]:
+                        return (2, "AVG has known issues with GNS3, even after you disable it. You must whitelist dynamips.exe in the AVG preferences.")
+                except psutil.NoSuchProcess:
+                    pass
         return (0, None)
 
     def checkFreeRam(self):

gns3/http_client.py

@@ -391,21 +391,22 @@ class HTTPClient(QtCore.QObject):
             return
 
         if params["version"].split("-")[0] != __version__.split("-")[0]:
-            msg = "Client version {} differs with server version {}".format(__version__, params["version"])
-            log.error(msg)
+            msg = "Client version {} is not the same as server version {}".format(__version__, params["version"])
             # Stable release
             if __version_info__[3] == 0:
+                log.error(msg)
                 for request, callback in self._query_waiting_connections:
                     if callback is not None:
                         callback({"message": msg}, error=True, server=server)
                 return
             # We don't allow different major version to interact even with dev build
             elif parse_version(__version__)[:2] != parse_version(params["version"])[:2]:
+                log.error(msg)
                 for request, callback in self._query_waiting_connections:
                     if callback is not None:
                         callback({"message": msg}, error=True, server=server)
                 return
-            log.warning("Use a different client and server version can create bugs. Use it at your own risk.")
+            log.warning("{}\nUsing different versions may result in unexpected problems. Please use at your own risk.".format(msg))
 
         self._connected = True
         self._retry = 0

gns3/modules/virtualbox/__init__.py

@@ -23,12 +23,10 @@ import os
 import sys
 import shutil
 
-from gns3.qt import QtWidgets
 from gns3.local_server_config import LocalServerConfig
 from gns3.local_config import LocalConfig
 
 from ..module import Module
-from ..module_error import ModuleError
 from .virtualbox_vm import VirtualBoxVM
 from .settings import VBOX_SETTINGS
 from .settings import VBOX_VM_SETTINGS
@@ -78,7 +76,8 @@ class VirtualBox(Module):
             vboxmanage_path_osx = "/Applications/VirtualBox.app/Contents/MacOS/VBoxManage"
             if os.path.exists(vboxmanage_path_osx):
                 vboxmanage_path = vboxmanage_path_osx
-        else:
+
+        if vboxmanage_path is None:
             vboxmanage_path = shutil.which("vboxmanage")
 
         if vboxmanage_path is None:

gns3/telnet_console.py

@@ -70,7 +70,7 @@ class ConsoleThread(QtCore.QThread):
         # replace the place-holders by the actual values
         command = self._command.replace("%h", host)
         command = command.replace("%p", str(port))
-        command = command.replace("%d", self._name)
+        command = command.replace("%d", self._name.replace('"', '\\"'))
         command = command.replace("%i", self._node.project().id())
         command = command.replace("%n", str(self._node.id()))
         command = command.replace("%c", Controller.instance().httpClient().fullUrl())

gns3/version.py

@@ -15,9 +15,16 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+# __version__ is a human-readable version number.
 
-__version__ = "2.1.2"
-__version_info__ = (2, 1, 2, 0)
+# __version_info__ is a four-tuple for programmatic comparison. The first
+# three numbers are the components of the version number. The fourth
+# is zero for an official release, positive for a development branch,
+# or negative for a release candidate or beta (after the base version
+# number has been incremented)
+
+__version__ = "2.1.3"
+__version_info__ = (2, 1, 3, 0)
 
 # If it's a git checkout try to add the commit
 if "dev" in __version__:

tests/test_http_client.py

@@ -306,7 +306,7 @@ def test_callbackConnect_major_version_invalid(http_client):
     http_client._query_waiting_connections.append((None, mock))
     http_client._callbackConnect(params)
     assert http_client._connected is False
-    mock.assert_called_with({"message": "Client version {} differs with server version 1.2.3".format(__version__)}, error=True, server=None)
+    mock.assert_called_with({"message": "Client version {} is not the same as server version 1.2.3".format(__version__)}, error=True, server=None)
 
 
 def test_callbackConnect_minor_version_invalid(http_client):
@@ -323,7 +323,7 @@ def test_callbackConnect_minor_version_invalid(http_client):
     if __version_info__[3] == 0:
         http_client._callbackConnect(params)
         assert http_client._connected is False
-        mock.assert_called_with({"message": "Client version {} differs with server version {}".format(__version__, new_version)}, error=True, server=None)
+        mock.assert_called_with({"message": "Client version {} is not the same as server version {}".format(__version__, new_version)}, error=True, server=None)
     else:
         http_client._callbackConnect(params)
         assert http_client._connected is True