# HG changeset patch # User Pascal Volk # Date 1352053991 0 # Node ID ca6621caff2fe76203161af0b1ddec7ddf14b509 # Parent 27334cfc0c90a304aae72fa30b464c8980ea4b8a VMM: Removed module pycompat. diff -r 27334cfc0c90 -r ca6621caff2f VirtualMailManager/alias.py --- a/VirtualMailManager/alias.py Sun Nov 04 18:02:19 2012 +0000 +++ b/VirtualMailManager/alias.py Sun Nov 04 18:33:11 2012 +0000 @@ -13,7 +13,6 @@ EmailAddress, DestinationEmailAddress as DestAddr from VirtualMailManager.errors import AliasError as AErr from VirtualMailManager.ext.postconf import Postconf -from VirtualMailManager.pycompat import all from VirtualMailManager.constants import \ ALIAS_EXCEEDS_EXPANSION_LIMIT, NO_SUCH_ALIAS, NO_SUCH_DOMAIN diff -r 27334cfc0c90 -r ca6621caff2f VirtualMailManager/catchall.py --- a/VirtualMailManager/catchall.py Sun Nov 04 18:02:19 2012 +0000 +++ b/VirtualMailManager/catchall.py Sun Nov 04 18:33:11 2012 +0000 @@ -23,7 +23,6 @@ EmailAddress, DestinationEmailAddress as DestAddr from VirtualMailManager.errors import AliasError as AErr from VirtualMailManager.ext.postconf import Postconf -from VirtualMailManager.pycompat import all from VirtualMailManager.constants import \ ALIAS_EXCEEDS_EXPANSION_LIMIT, NO_SUCH_ALIAS, NO_SUCH_DOMAIN diff -r 27334cfc0c90 -r ca6621caff2f VirtualMailManager/domain.py --- a/VirtualMailManager/domain.py Sun Nov 04 18:02:19 2012 +0000 +++ b/VirtualMailManager/domain.py Sun Nov 04 18:33:11 2012 +0000 @@ -18,7 +18,6 @@ from VirtualMailManager.common import validate_transport from VirtualMailManager.errors import VMMError, DomainError as DomErr from VirtualMailManager.maillocation import MailLocation -from VirtualMailManager.pycompat import all, any from VirtualMailManager.quotalimit import QuotaLimit from VirtualMailManager.serviceset import ServiceSet from VirtualMailManager.transport import Transport diff -r 27334cfc0c90 -r ca6621caff2f VirtualMailManager/handler.py --- a/VirtualMailManager/handler.py Sun Nov 04 18:02:19 2012 +0000 +++ b/VirtualMailManager/handler.py Sun Nov 04 18:33:11 2012 +0000 @@ -37,7 +37,6 @@ from VirtualMailManager.errors import \ DomainError, NotRootError, PermissionError, VMMError from VirtualMailManager.mailbox import new as new_mailbox -from VirtualMailManager.pycompat import all, any from VirtualMailManager.quotalimit import QuotaLimit from VirtualMailManager.relocated import Relocated from VirtualMailManager.serviceset import ServiceSet, SERVICES diff -r 27334cfc0c90 -r ca6621caff2f VirtualMailManager/maillocation.py --- a/VirtualMailManager/maillocation.py Sun Nov 04 18:02:19 2012 +0000 +++ b/VirtualMailManager/maillocation.py Sun Nov 04 18:33:11 2012 +0000 @@ -12,7 +12,6 @@ from VirtualMailManager.constants import MAILLOCATION_INIT from VirtualMailManager.errors import MailLocationError as MLErr -from VirtualMailManager.pycompat import all __all__ = ('MailLocation', 'known_format') diff -r 27334cfc0c90 -r ca6621caff2f VirtualMailManager/pycompat/__init__.py --- a/VirtualMailManager/pycompat/__init__.py Sun Nov 04 18:02:19 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -# -*- coding: UTF-8 -*- -# Copyright (c) 2010 - 2012, Pascal Volk -# See COPYING for distribution information. - -""" - VirtualMailManager.pycompat - - VirtualMailManager's compatibility stuff for Python 2.4 -""" - -# http://docs.python.org/library/functions.html#all -try: - all = all -except NameError: - def all(iterable): - """Return True if all elements of the *iterable* are true - (or if the iterable is empty). - - """ - for element in iterable: - if not element: - return False - return True - - -# http://docs.python.org/library/functions.html#any -try: - any = any -except NameError: - def any(iterable): - """Return True if any element of the *iterable* is true. If the - iterable is empty, return False. - - """ - for element in iterable: - if element: - return True - return False diff -r 27334cfc0c90 -r ca6621caff2f VirtualMailManager/quotalimit.py --- a/VirtualMailManager/quotalimit.py Sun Nov 04 18:02:19 2012 +0000 +++ b/VirtualMailManager/quotalimit.py Sun Nov 04 18:33:11 2012 +0000 @@ -9,8 +9,6 @@ for domains and accounts. """ -from VirtualMailManager.pycompat import all - _ = lambda msg: msg diff -r 27334cfc0c90 -r ca6621caff2f VirtualMailManager/transport.py --- a/VirtualMailManager/transport.py Sun Nov 04 18:02:19 2012 +0000 +++ b/VirtualMailManager/transport.py Sun Nov 04 18:33:11 2012 +0000 @@ -9,8 +9,6 @@ domains and accounts. """ -from VirtualMailManager.pycompat import any - _ = lambda msg: msg diff -r 27334cfc0c90 -r ca6621caff2f setup.py --- a/setup.py Sun Nov 04 18:02:19 2012 +0000 +++ b/setup.py Sun Nov 04 18:33:11 2012 +0000 @@ -20,7 +20,6 @@ 'VirtualMailManager', 'VirtualMailManager.cli', 'VirtualMailManager.ext', - 'VirtualMailManager.pycompat', ] # http://pypi.python.org/pypi?%3Aaction=list_classifiers classifiers = ['Development Status :: 5 - Production/Stable',