diff -r 4cd9d0a9f42f -r df1e3b67882a VirtualMailManager/emailaddress.py --- a/VirtualMailManager/emailaddress.py Sun Nov 11 16:53:52 2012 +0000 +++ b/VirtualMailManager/emailaddress.py Tue Nov 20 13:40:32 2012 +0000 @@ -26,7 +26,7 @@ def __init__(self, address, _validate=True): """Creates a new instance from the string/unicode ``address``.""" - assert isinstance(address, basestring) + assert isinstance(address, str) self._localpart = None self._domainname = None if _validate: @@ -70,16 +70,16 @@ parts = address.split('@') p_len = len(parts) if p_len < 2: - raise EAErr(_(u"Missing the '@' sign in address: '%s'") % address, + raise EAErr(_("Missing the '@' sign in address: '%s'") % address, INVALID_ADDRESS) elif p_len > 2: - raise EAErr(_(u"Too many '@' signs in address: '%s'") % address, + raise EAErr(_("Too many '@' signs in address: '%s'") % address, INVALID_ADDRESS) if not parts[0]: - raise EAErr(_(u"Missing local-part in address: '%s'") % address, + raise EAErr(_("Missing local-part in address: '%s'") % address, LOCALPART_INVALID) if not parts[1]: - raise EAErr(_(u"Missing domain name in address: '%s'") % address, + raise EAErr(_("Missing domain name in address: '%s'") % address, DOMAIN_NO_NAME) self._localpart = check_localpart(parts[0]) self._domainname = check_domainname(parts[1]) @@ -105,7 +105,7 @@ if not _validate: try: self._chk_address(address) - except DomainError, err: + except DomainError as err: if err.code is DOMAIN_INVALID and \ address.split('@')[1] == 'localhost': self._localhost = True @@ -142,13 +142,13 @@ invalid characters. """ if len(localpart) > 64: - raise EAErr(_(u"The local-part '%s' is too long.") % localpart, + raise EAErr(_("The local-part '%s' is too long.") % localpart, LOCALPART_TOO_LONG) invalid_chars = set(RE_LOCALPART.findall(localpart)) if invalid_chars: - i_chars = u''.join((u'"%s" ' % c for c in invalid_chars)) - raise EAErr(_(u"The local-part '%(l_part)s' contains invalid " - u"characters: %(i_chars)s") % {'l_part': localpart, + i_chars = ''.join(('"%s" ' % c for c in invalid_chars)) + raise EAErr(_("The local-part '%(l_part)s' contains invalid " + "characters: %(i_chars)s") % {'l_part': localpart, 'i_chars': i_chars}, LOCALPART_INVALID) return localpart