From: Kefu Chai <kchai@redhat.com>
Date: Mon, 24 May 2021 02:00:25 +0000 (+0800)
Subject: pybind/ceph_daemon: import OrderedDict from collections
X-Git-Tag: v17.1.0~1847^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F41491%2Fhead;p=ceph.git

pybind/ceph_daemon: import OrderedDict from collections

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>
---

diff --git a/src/pybind/ceph_daemon.py b/src/pybind/ceph_daemon.py
index 26eaeb1f60cd..c86adc3ea616 100644
--- a/src/pybind/ceph_daemon.py
+++ b/src/pybind/ceph_daemon.py
@@ -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