# HG changeset patch # User Pascal Volk # Date 1270462971 0 # Node ID 8f56166a3283c7630ff13c740bbf8d25450f3676 # Parent 8c4df3dd2d2c65acdf00e4a038b95152e89c285b VMM/VMM: applied 'code compression' from v0.6.x(09b7e3fe29b3) to VirtualMailManager.domainList(). diff -r 8c4df3dd2d2c -r 8f56166a3283 VirtualMailManager/VirtualMailManager.py --- a/VirtualMailManager/VirtualMailManager.py Sun Mar 21 09:17:26 2010 +0000 +++ b/VirtualMailManager/VirtualMailManager.py Mon Apr 05 10:22:51 2010 +0000 @@ -573,12 +573,7 @@ if pattern is not None: if pattern.startswith('%') or pattern.endswith('%'): like = True - if pattern.startswith('%') and pattern.endswith('%'): - domain = pattern[1:-1] - elif pattern.startswith('%'): - domain = pattern[1:] - elif pattern.endswith('%'): - domain = pattern[:-1] + domain = pattern.strip('%') if not re.match(RE_DOMAIN_SRCH, domain): raise VMMException( _(u"The pattern ā€œ%sā€ contains invalid characters.") %