From 14903b4ca7d625b8e93fe431f854263bbe26e4bc Mon Sep 17 00:00:00 2001 From: Shuangtai Tian Date: Thu, 20 Feb 2014 14:43:11 +0800 Subject: [PATCH] Python 3: replace "im_self" by "__self__" The Python 3 removed the "im_self" attribute and only supports the "__self__". This patch replaces "im_self" by "__self__" attribute. Closes-Bug: #1282514 Change-Id: Ib017fff4b720a5dd7ee27fd01b36a531d9b6ca9c --- cinder/volume/flows/common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cinder/volume/flows/common.py b/cinder/volume/flows/common.py index f5e34d4fe..2378db853 100644 --- a/cinder/volume/flows/common.py +++ b/cinder/volume/flows/common.py @@ -32,9 +32,9 @@ def make_pretty_name(method): """Makes a pretty name for a function/method.""" meth_pieces = [method.__name__] # If its an instance method attempt to tack on the class name - if hasattr(method, 'im_self') and method.im_self is not None: + if hasattr(method, '__self__') and method.__self__ is not None: try: - meth_pieces.insert(0, method.im_self.__class__.__name__) + meth_pieces.insert(0, method.__self__.__class__.__name__) except AttributeError: pass return ".".join(meth_pieces) -- 2.45.2