]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
pybind/ceph_daemon: import OrderedDict from collections 41491/head
authorKefu Chai <kchai@redhat.com>
Mon, 24 May 2021 02:00:25 +0000 (10:00 +0800)
committerKefu Chai <kchai@redhat.com>
Mon, 24 May 2021 02:02:02 +0000 (10:02 +0800)
as OrderedDict is always provided by collections module since Python3.1,
and we only support python3.6 and up, there is no need to try to import
OrderedDict from collections.abc anymore.

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/pybind/ceph_daemon.py

index 26eaeb1f60cd9651979fa423d31ab356166c13c1..c86adc3ea616b04241f46b7ffc7fcff6842af332 100644 (file)
@@ -15,10 +15,7 @@ import json
 import socket
 import struct
 import time
-try:
-    from collections.abc import OrderedDict
-except ImportError:
-    from collections import OrderedDict
+from collections import OrderedDict
 from fcntl import ioctl
 from fnmatch import fnmatch
 from prettytable import PrettyTable, HEADER