From 0f31238e06b89c79f33b00d8c4ea81c8200bd076 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Tue, 28 Aug 2012 15:56:26 -0400 Subject: Compat: added all() for py2.4 --- src/lib/Bcfg2/Server/Plugins/Metadata.py | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'src/lib/Bcfg2/Server/Plugins') diff --git a/src/lib/Bcfg2/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py index 9eb21b383..baa2bd0be 100644 --- a/src/lib/Bcfg2/Server/Plugins/Metadata.py +++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py @@ -15,7 +15,7 @@ import Bcfg2.Server import Bcfg2.Server.Lint import Bcfg2.Server.Plugin import Bcfg2.Server.FileMonitor -from Bcfg2.Compat import MutableMapping +from Bcfg2.Compat import MutableMapping, all from Bcfg2.version import Bcfg2VersionInfo try: @@ -26,19 +26,6 @@ except ImportError: logger = logging.getLogger(__name__) -try: - all -except NameError: - # some of the crazy lexical closure stuff below works with all() - # but not with this loop inline. i really don't understand - # lexical closures some^Wmost days - def all(iterable): - for element in iterable: - if not element: - return False - return True - - def locked(fd): """Aquire a lock on a file""" try: -- cgit v1.2.3-1-g7c22