From: Sage Weil <sage@redhat.com>
Date: Mon, 26 Nov 2018 17:25:19 +0000 (-0600)
Subject: Merge PR #24798 into master
X-Git-Tag: v14.1.0~808
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=630a36a5093a607392026131046d51fa28fa0c60;p=ceph.git

Merge PR #24798 into master

* refs/pull/24798/head:
	fix python collections module warning for v3.7 and above

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

630a36a5093a607392026131046d51fa28fa0c60
diff --cc src/pybind/rbd/rbd.pyx
index 522db5ac7272,240aac9af5b9..796046ba0cb0
--- a/src/pybind/rbd/rbd.pyx
+++ b/src/pybind/rbd/rbd.pyx
@@@ -23,9 -23,11 +23,12 @@@ from libc.stdint cimport 
  from libc.stdlib cimport realloc, free
  from libc.string cimport strdup
  
- from collections import Iterable
+ try:
+     from collections.abc import Iterable
+ except ImportError:
+     from collections import Iterable
  from datetime import datetime
 +from itertools import chain
  
  cimport rados