From 1738f27d3683d58b3ab023724eb8d0133c428eef Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Wed, 15 Jul 2015 11:11:35 +0200 Subject: Replace Exception.message with str(exc) Python 3 has deprecated and remove Exception.message. Instead we should simply use string formatting to print the message of an Exception. >>> import pki >>> pki.PKIException('msg') PKIException('msg',) >>> pki.PKIException('msg').message 'msg' >>> str(pki.PKIException('msg')) 'msg' >>> '%s' % pki.PKIException('msg') 'msg' --- base/common/python/pki/upgrade.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'base/common/python') diff --git a/base/common/python/pki/upgrade.py b/base/common/python/pki/upgrade.py index 5534069c1..30911613a 100644 --- a/base/common/python/pki/upgrade.py +++ b/base/common/python/pki/upgrade.py @@ -307,7 +307,7 @@ class PKIUpgradeScriptlet(object): if verbose: traceback.print_exc() else: - print 'ERROR: ' + e.message + print 'ERROR: %s' % e message = 'Failed upgrading system.' if self.upgrader.silent: @@ -320,7 +320,7 @@ class PKIUpgradeScriptlet(object): if result == 'y': return - raise pki.PKIException('Upgrade failed: ' + e.message, e) + raise pki.PKIException('Upgrade failed: %s' % e, e) def revert(self): @@ -631,7 +631,7 @@ class PKIUpgrader(object): if verbose: traceback.print_exc() else: - print e.message + print e print @@ -693,12 +693,12 @@ class PKIUpgrader(object): print - message = 'Revert failed: ' + e.message + message = 'Revert failed: %s' % e if verbose: traceback.print_exc() else: - print e.message + print e print -- cgit