From 00d43095da211f542189c95c88fc2e2c32e75565 Mon Sep 17 00:00:00 2001
From: Martin Basti <mbasti@redhat.com>
Date: Mon, 5 Sep 2016 13:15:30 +0200
Subject: Fix ScriptError to always return string from __str__

Use super for proper handling of exceptions. msg property was added due
compatibility with the current code.

https://fedorahosted.org/freeipa/ticket/6294

Reviewed-By: Tomas Krizek <tkrizek@redhat.com>
---
 ipapython/admintool.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'ipapython')

diff --git a/ipapython/admintool.py b/ipapython/admintool.py
index e40f300b1..ec0e7e079 100644
--- a/ipapython/admintool.py
+++ b/ipapython/admintool.py
@@ -38,11 +38,12 @@ class ScriptError(Exception):
     def __init__(self, msg='', rval=1):
         if msg is None:
             msg = ''
-        self.msg = msg
+        super(ScriptError, self).__init__(msg)
         self.rval = rval
 
-    def __str__(self):
-        return self.msg
+    @property
+    def msg(self):
+        return str(self)
 
 
 class AdminTool(object):
-- 
cgit