summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhiQiang Fan <aji.zqfan@gmail.com>2016-02-18 02:57:00 +0800
committerPradeep Kilambi <pkilambi@redhat.com>2016-02-22 16:32:38 +0000
commit24fe1d6bbbbe35db45b22ad18aaf18bafddad176 (patch)
treed9c598748f9c511688582e15b6efca215121304f
parentf9d52b8ab5c1aca60c5b74c1651209b04d7990bf (diff)
downloadceilometer-24fe1d6bbbbe35db45b22ad18aaf18bafddad176.tar.gz
Gnocchi: fix ResourcesDefinitionException for py3
In Python 3, Exception.message doesn't exist any more. Change-Id: I77b4f2111d23861ec093b66f02add8c92e220026 (cherry picked from commit 15f527479e6e41a3665c08303bc05fdb40c88700)
-rw-r--r--ceilometer/dispatcher/gnocchi.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/ceilometer/dispatcher/gnocchi.py b/ceilometer/dispatcher/gnocchi.py
index ea8187d6..92c31d33 100644
--- a/ceilometer/dispatcher/gnocchi.py
+++ b/ceilometer/dispatcher/gnocchi.py
@@ -90,12 +90,8 @@ class LegacyArchivePolicyDefinition(object):
class ResourcesDefinitionException(Exception):
def __init__(self, message, definition_cfg):
- super(ResourcesDefinitionException, self).__init__(message)
- self.definition_cfg = definition_cfg
-
- def __str__(self):
- return '%s %s: %s' % (self.__class__.__name__,
- self.definition_cfg, self.message)
+ msg = '%s %s: %s' % (self.__class__.__name__, definition_cfg, message)
+ super(ResourcesDefinitionException, self).__init__(msg)
class ResourcesDefinition(object):