From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 2 Dec 2009 08:47:49 +0000 (+0000)
Subject: xm: fix message in OptionError deprecated since Python 2.6
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~12986
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2cdc56dff4deea9438faad1013f49e9ceeaa15b2;p=xen.git

xm: fix message in OptionError deprecated since Python 2.6

BaseException.message has been deprecated since Python 2.6.  To
prevent DeprecationWarning from popping up over this pre-existing
attribute, use a new property that takes lookup precedence.

Signed-off-by: Wei Kong <weikong.cn@gmail.com>
---

diff --git a/tools/python/xen/xm/opts.py b/tools/python/xen/xm/opts.py
index 3bfa8eb6ad..5b69fa263a 100644
--- a/tools/python/xen/xm/opts.py
+++ b/tools/python/xen/xm/opts.py
@@ -55,10 +55,19 @@ def wrap(text, width = 70):
     return lines
 
 class OptionError(Exception):
+    def _get_message(self):
+        return self.__message
+
+    def _set_message(self, value):
+        self.__message = value
+
+    message = property(_get_message, _set_message)
+
     """Denotes an error in option parsing."""
     def __init__(self, message, usage = ''):
         self.message = message
         self.usage = usage
+        Exception.__init__(self, message)
     def __str__(self):
         return self.message