diff options
author | Petr Viktorin <pviktori@redhat.com> | 2015-07-30 16:49:29 +0200 |
---|---|---|
committer | Tomas Babej <tbabej@redhat.com> | 2015-08-12 18:17:23 +0200 |
commit | 27dabb45282911e375336f75934af9dd6cc5d963 (patch) | |
tree | 3c8fe5255d60613fa9cd14d053b3688feed740c9 /ipalib/parameters.py | |
parent | a651be3eec2a08bd2865b16b0eed767db69aab0f (diff) | |
download | freeipa-27dabb45282911e375336f75934af9dd6cc5d963.tar.gz freeipa-27dabb45282911e375336f75934af9dd6cc5d963.tar.xz freeipa-27dabb45282911e375336f75934af9dd6cc5d963.zip |
Modernize 'except' clauses
The 'as' syntax works from Python 2 on, and Python 3 will
drop the "comma" syntax.
Reviewed-By: Tomas Babej <tbabej@redhat.com>
Diffstat (limited to 'ipalib/parameters.py')
-rw-r--r-- | ipalib/parameters.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ipalib/parameters.py b/ipalib/parameters.py index 6cc6f8c92..7b27b70c2 100644 --- a/ipalib/parameters.py +++ b/ipalib/parameters.py @@ -1134,7 +1134,7 @@ class Decimal(Number): if isinstance(value, (basestring, float)): try: value = decimal.Decimal(value) - except Exception, e: + except Exception as e: raise ValueError( '%s: cannot parse kwarg %s: %s' % ( name, kwparam, str(e))) @@ -1189,7 +1189,7 @@ class Decimal(Number): quantize_exp = decimal.Decimal(10) ** -self.precision try: value = value.quantize(quantize_exp) - except decimal.DecimalException, e: + except decimal.DecimalException as e: raise ConversionError(name=self.get_param_name(), error=unicode(e)) return value @@ -1203,7 +1203,7 @@ class Decimal(Number): value = value.quantize(decimal.Decimal(1)) \ if value == value.to_integral() \ else value.normalize() - except decimal.DecimalException, e: + except decimal.DecimalException as e: raise ConversionError(name=self.get_param_name(), error=unicode(e)) @@ -1224,7 +1224,7 @@ class Decimal(Number): if isinstance(value, (basestring, float)): try: value = decimal.Decimal(value) - except decimal.DecimalException, e: + except decimal.DecimalException as e: raise ConversionError(name=self.get_param_name(), index=index, error=unicode(e)) @@ -1363,7 +1363,7 @@ class Bytes(Data): if isinstance(value, unicode): try: value = base64.b64decode(value) - except TypeError, e: + except TypeError as e: raise Base64DecodeError(reason=str(e)) return super(Bytes, self)._convert_scalar(value, index) @@ -1826,7 +1826,7 @@ class AccessTime(Str): def _rule_required(self, _, value): try: self._check(value) - except ValueError, e: + except ValueError as e: raise ValidationError(name=self.get_param_name(), error=e.args[0]) except IndexError: raise ValidationError( @@ -1847,7 +1847,7 @@ class DNParam(Param): try: dn = DN(value) - except Exception, e: + except Exception as e: raise ConversionError(name=self.get_param_name(), index=index, error=ugettext(e)) return dn |