]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/volumes: fixup threading.Timer import
authorMichael Fritch <mfritch@suse.com>
Tue, 3 Mar 2020 15:20:09 +0000 (08:20 -0700)
committerMichael Fritch <mfritch@suse.com>
Thu, 5 Mar 2020 20:19:33 +0000 (13:19 -0700)
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>
src/pybind/mgr/volumes/fs/operations/volume.py

index d3b295ba5db77d00cbb3620f5cc995a1670f234a..03b1face0c6759171254b42090a0417181516f35 100644 (file)
@@ -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