VirtualMailManager/handler.py
changeset 702 01db2457bbed
parent 675 d24f094d1cb5
child 703 58815c004a61
equal deleted inserted replaced
701:110491a871a7 702:01db2457bbed
   520                            'relocated', 'catchall']:
   520                            'relocated', 'catchall']:
   521             raise VMMError(_(u"Invalid argument: '%s'") % details,
   521             raise VMMError(_(u"Invalid argument: '%s'") % details,
   522                            INVALID_ARGUMENT)
   522                            INVALID_ARGUMENT)
   523         dom = self._get_domain(domainname)
   523         dom = self._get_domain(domainname)
   524         dominfo = dom.get_info()
   524         dominfo = dom.get_info()
   525         if dominfo['domain name'].startswith('xn--'):
   525         if dominfo['domain name'].startswith('xn--') or \
       
   526            dominfo['domain name'].count('.xn--'):
   526             dominfo['domain name'] += ' (%s)' % \
   527             dominfo['domain name'] += ' (%s)' % \
   527                                       dominfo['domain name'].decode('idna')
   528                                       dominfo['domain name'].decode('idna')
   528         if details is None:
   529         if details is None:
   529             return dominfo
   530             return dominfo
   530         elif details == 'accounts':
   531         elif details == 'accounts':