From: Hector Martin <marcan@marcan.st>
Date: Fri, 26 Feb 2016 10:18:53 +0000 (+0900)
Subject: pybind/rados: s/__del__/__dealloc__/
X-Git-Tag: v11.0.0~394^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=71cca02edd8487e37eb76d35d6baec32daea6835;p=ceph.git

pybind/rados: s/__del__/__dealloc__/

Signed-off-by: Hector Martin <marcan@marcan.st>
---

diff --git a/src/pybind/rados/rados.pyx b/src/pybind/rados/rados.pyx
index 4eeeeed0a011..955d2bdf404a 100644
--- a/src/pybind/rados/rados.pyx
+++ b/src/pybind/rados/rados.pyx
@@ -1750,7 +1750,7 @@ cdef class Ioctx(object):
         self.close()
         return False
 
-    def __del__(self):
+    def __dealloc__(self):
         self.close()
 
     def __track_completion(self, completion_obj):
diff --git a/src/test/pybind/test_rbd.py b/src/test/pybind/test_rbd.py
index 259221dc4ef1..2341e36de99f 100644
--- a/src/test/pybind/test_rbd.py
+++ b/src/test/pybind/test_rbd.py
@@ -44,7 +44,7 @@ def setup_module():
 
 def teardown_module():
     global ioctx
-    ioctx.__del__()
+    ioctx.close()
     global rados
     rados.delete_pool(pool_name)
     rados.shutdown()
@@ -1026,7 +1026,7 @@ class TestExclusiveLock(object):
     def tearDown(self):
         remove_image()
         global ioctx2
-        ioctx2.__del__()
+        ioctx2.close()
         global rados2
         rados2.shutdown()