Merge pull request #7937 from saru95/patch--1

ceph_daemon.py: Resolved ImportError to work with python3 Reviewed-by: Josh Durgin <jdurgin@redhat.com>
ceph · Mar 4, 2016 · 56ca573 · 56ca573
2 parents 28cc0ca + 9e47cef
commit 56ca573
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/test/pybind/test_ceph_daemon.py b/src/test/pybind/test_ceph_daemon.py
@@ -11,12 +11,15 @@
 Foundation.  See file COPYING.
 """
 
-from StringIO import StringIO
-
 from unittest import TestCase
 
 from ceph_daemon import DaemonWatcher
 
+try:
+    from StringIO import StringIO
+except ImportError:
+    from io import StringIO
+
 
 class TestDaemonWatcher(TestCase):
     def test_format(self):