IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Switch %r specifiers to '%s' in Public errors

Browse Source 
This switch drops the preceding 'u' from strings within Public error messages.

This patch also addresses the related unfriendly 'u' from re-raising errors from netaddr.IPAddress by passing a bytestring through the function.

Also switched ValidationError to TypeError in validate_scalar per jcholast@redhat.com.

Ticket: https://fedorahosted.org/freeipa/ticket/3121
Ticket: https://fedorahosted.org/freeipa/ticket/2588
This commit is contained in:
Lynn Root
2012-11-08 10:06:35 -05:00
committed by Martin Kosek
parent 585b91df3b
commit 173ee4d141
8 changed files with 43 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ipalib/parameters.py
View File

@@ -879,10 +879,8 @@ class Param(ReadOnly):
def _validate_scalar(self, value, index=None):
if type(value) is not self.type:
raise ValidationError(name=self.name,
error='need a %r; got %r (a %r)' % (
self.type, value, type(value)
)
raise TypeError(
TYPE_ERROR % (self.name, self.type, value, type(value))
)
if index is not None and type(index) is not int:
raise TypeError(
@@ -1167,11 +1165,9 @@ class Int(Number):
the exception that it allows both int and long types. The
min/max rules handle size enforcement.
"""
if type(value) not in (int, long):
raise ValidationError(name=self.name,
error='need a %r; got %r (a %r)' % (
self.type, value, type(value)
)
if type(value) not in (int, long):
raise TypeError(
TYPE_ERROR % (self.name, self.type, value, type(value))
)
if index is not None and type(index) is not int:
raise TypeError(
@@ -1553,7 +1549,7 @@ class IA5Str(Str):
if ord(value[i]) > 127:
raise ConversionError(name=self.get_param_name(),
index=index,
error=_('The character \'%(char)r\' is not allowed.') %
error=_('The character %(char)r is not allowed.') %
dict(char=value[i],)
)
return super(IA5Str, self)._convert_scalar(value, index)