--- a/VirtualMailManager/domain.py Sun Nov 11 16:53:52 2012 +0000
+++ b/VirtualMailManager/domain.py Tue Nov 20 13:40:32 2012 +0000
@@ -78,7 +78,7 @@
dbc.close()
if result:
if not result[5]:
- raise DomErr(_(u"The domain '%s' is an alias domain.") %
+ raise DomErr(_("The domain '%s' is an alias domain.") %
self._name, DOMAIN_ALIAS_EXISTS)
self._gid, self._directory = result[0], result[4]
self._qlimit = QuotaLimit(self._dbh, qid=result[1])
@@ -113,9 +113,9 @@
result = result[0]
if any(result):
keys = ('account_count', 'alias_count', 'relocated_count')
- raise DomErr(_(u'There are %(account_count)u accounts, '
- u'%(alias_count)u aliases and %(relocated_count)u '
- u'relocated users.') % dict(zip(keys, result)),
+ raise DomErr(_('There are %(account_count)u accounts, '
+ '%(alias_count)u aliases and %(relocated_count)u '
+ 'relocated users.') % dict(list(zip(keys, result))),
ACCOUNT_AND_ALIAS_PRESENT)
def _chk_state(self, must_exist=True):
@@ -125,10 +125,10 @@
- or *must_exist* is `False` and the domain exists
"""
if must_exist and self._new:
- raise DomErr(_(u"The domain '%s' does not exist.") % self._name,
+ raise DomErr(_("The domain '%s' does not exist.") % self._name,
NO_SUCH_DOMAIN)
elif not must_exist and not self._new:
- raise DomErr(_(u"The domain '%s' already exists.") % self._name,
+ raise DomErr(_("The domain '%s' already exists.") % self._name,
DOMAIN_EXISTS)
def _update_tables(self, column, value):
@@ -263,7 +263,7 @@
The note, or None to remove
"""
self._chk_state(False)
- assert note is None or isinstance(note, basestring)
+ assert note is None or isinstance(note, str)
self._note = note
def save(self):
@@ -325,8 +325,8 @@
enforce new quota limit for all accounts, default `False`
"""
if cfg_dget('misc.dovecot_version') < 0x10102f00:
- raise VMMError(_(u'PostgreSQL-based dictionary quota requires '
- u'Dovecot >= v1.1.2.'), VMM_ERROR)
+ raise VMMError(_('PostgreSQL-based dictionary quota requires '
+ 'Dovecot >= v1.1.2.'), VMM_ERROR)
self._chk_state()
assert isinstance(quotalimit, QuotaLimit)
if not force and quotalimit == self._qlimit:
@@ -388,7 +388,7 @@
the new note
"""
self._chk_state()
- assert note is None or isinstance(note, basestring)
+ assert note is None or isinstance(note, str)
if note == self._note:
return
self._update_tables('note', note)
@@ -405,7 +405,7 @@
dbc.close()
keys = ('alias domains', 'accounts', 'aliases', 'relocated',
'catch-all dests')
- info = dict(zip(keys, info))
+ info = dict(list(zip(keys, info)))
info['gid'] = self._gid
info['domain name'] = self._name
info['transport'] = self._transport.transport
@@ -432,7 +432,7 @@
dbc.close()
accounts = []
if users:
- addr = u'@'.join
+ addr = '@'.join
_dom = self._name
accounts = [addr((account[0], _dom)) for account in users]
return accounts
@@ -447,7 +447,7 @@
dbc.close()
aliases = []
if addresses:
- addr = u'@'.join
+ addr = '@'.join
_dom = self._name
aliases = [addr((alias[0], _dom)) for alias in addresses]
return aliases
@@ -462,7 +462,7 @@
dbc.close()
relocated = []
if addresses:
- addr = u'@'.join
+ addr = '@'.join
_dom = self._name
relocated = [addr((address[0], _dom)) for address in addresses]
return relocated
@@ -501,9 +501,9 @@
if not RE_DOMAIN.match(domainname):
domainname = domainname.encode('idna')
if len(domainname) > 255:
- raise DomErr(_(u'The domain name is too long'), DOMAIN_TOO_LONG)
+ raise DomErr(_('The domain name is too long'), DOMAIN_TOO_LONG)
if not RE_DOMAIN.match(domainname):
- raise DomErr(_(u"The domain name '%s' is invalid") % domainname,
+ raise DomErr(_("The domain name '%s' is invalid") % domainname,
DOMAIN_INVALID)
return domainname