From da97ff26cacf6431a5fc94e3c6a70951d597742b Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 24 Jan 2020 08:57:29 +0000 Subject: [PATCH] stricter exception type, fix potential error if import fails: cl_time was undefined git-svn-id: https://xpra.org/svn/Xpra/trunk@25072 3bb7dfac-3a0b-4e04-842a-767bc560f471 --- src/xpra/client/gtk_base/session_info.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/xpra/client/gtk_base/session_info.py b/src/xpra/client/gtk_base/session_info.py index 41da2613e6..ea8e77e564 100644 --- a/src/xpra/client/gtk_base/session_info.py +++ b/src/xpra/client/gtk_base/session_info.py @@ -172,12 +172,11 @@ def make_os_str(sys_platform, platform_release, platform_platform, platform_linu tb.new_row("Operating System", slabel(LOCAL_PLATFORM_NAME), slabel(SERVER_PLATFORM_NAME)) scaps = self.client.server_capabilities tb.new_row("Xpra", slabel(XPRA_VERSION), slabel(self.client._remote_version or "unknown")) - cl_rev, cl_ch, cl_date = "unknown", "", "" try: from xpra.build_info import BUILD_DATE as cl_date, BUILD_TIME as cl_time from xpra.src_info import REVISION as cl_rev, LOCAL_MODIFICATIONS as cl_ch #@UnresolvedImport - except: - pass + except ImportError: + cl_rev, cl_ch, cl_date, cl_time = "unknown", "", "", "" def make_version_str(version): if version and isinstance(version, (tuple, list)): version = ".".join(bytestostr(x) for x in version)