From 1a0367fa012957889ff6167b2df676b2649bd352 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alfonso=20Mart=C3=ADnez?= Date: Tue, 12 May 2020 14:04:41 +0200 Subject: [PATCH] mgr/dashboard: fix py2 strptime ImportError (not thread safe) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fixes: https://tracker.ceph.com/issues/45515 Signed-off-by: Alfonso Martínez --- src/pybind/mgr/dashboard/module.py | 1 + src/pybind/mgr/dashboard/tox.ini | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pybind/mgr/dashboard/module.py b/src/pybind/mgr/dashboard/module.py index 19d682c8ee3c..db7c903d1655 100644 --- a/src/pybind/mgr/dashboard/module.py +++ b/src/pybind/mgr/dashboard/module.py @@ -13,6 +13,7 @@ import threading import time from uuid import uuid4 from OpenSSL import crypto +import _strptime # pylint: disable=unused-import from mgr_module import MgrModule, MgrStandbyModule, Option, CLIWriteCommand from mgr_util import get_default_addr, ServerConfigException, verify_tls_files diff --git a/src/pybind/mgr/dashboard/tox.ini b/src/pybind/mgr/dashboard/tox.ini index 0c62ceab61ce..e9614a50cb0d 100644 --- a/src/pybind/mgr/dashboard/tox.ini +++ b/src/pybind/mgr/dashboard/tox.ini @@ -10,7 +10,7 @@ setenv= UNITTEST = true WEBTEST_INTERACTIVE = false LD_LIBRARY_PATH = {toxinidir}/../../../../build/lib - PATH = {toxinidir}/../../../../build/bin:$PATH + PATH = {toxinidir}/../../../../build/bin:{env:PATH} py27: PYTHONPATH = {env:CEPH_LIB}/cython_modules/lib.2 py3: PYTHONPATH = {env:CEPH_LIB}/cython_modules/lib.3 cov: UNITTEST = true -- 2.47.3