diff options
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/Bcfg2/Compat.py | 10 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Metadata.py | 15 |
2 files changed, 11 insertions, 14 deletions
diff --git a/src/lib/Bcfg2/Compat.py b/src/lib/Bcfg2/Compat.py index 6551ffc40..a245d3634 100644 --- a/src/lib/Bcfg2/Compat.py +++ b/src/lib/Bcfg2/Compat.py @@ -213,3 +213,13 @@ except ImportError: prefix=mname + '.', onerror=onerror): yield item + + +try: + all = all +except NameError: + def all(iterable): + for element in iterable: + if not element: + return False + return True 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: |