From: Michael Fritch <mfritch@suse.com>
Date: Tue, 3 Mar 2020 15:20:09 +0000 (-0700)
Subject: mgr/volumes: fixup threading.Timer import
X-Git-Tag: v15.1.1~93^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a611864dae86fcee9ea9cb9725aa26318396b55e;p=ceph.git

mgr/volumes: fixup threading.Timer import

Python 3.3 changed `Timer` from a factory function to a class
https://docs.python.org/3.8/library/threading.html#timer-objects

fixes mypy error:

volumes/fs/operations/volume.py:9: error: Module 'threading' has no attribute '_Timer'; maybe "Timer"?

Fixes: https://tracker.ceph.com/issues/44393
Signed-off-by: Michael Fritch <mfritch@suse.com>
---

diff --git a/src/pybind/mgr/volumes/fs/operations/volume.py b/src/pybind/mgr/volumes/fs/operations/volume.py
index d3b295ba5db..03b1face0c6 100644
--- a/src/pybind/mgr/volumes/fs/operations/volume.py
+++ b/src/pybind/mgr/volumes/fs/operations/volume.py
@@ -1,15 +1,15 @@
 import time
 import errno
 import logging
+import sys
+
 from contextlib import contextmanager
 from threading import Lock, Condition
 
-try:
-    # py2
-    from threading import _Timer as Timer
-except ImportError:
-    #py3
+if sys.version_info >= (3, 3):
     from threading import Timer
+else:
+    from threading import _Timer as Timer
 
 import cephfs
 import orchestrator