From da53b2b3fe5f5e1ba8511da9ed7adbf23800a9eb Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Fri, 18 Jan 2013 14:36:07 -0500 Subject: fixed syntax errors for py < 2.5 --- src/lib/Bcfg2/Server/Plugins/SSLCA.py | 3 ++- src/sbin/bcfg2-lint | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/Bcfg2/Server/Plugins/SSLCA.py b/src/lib/Bcfg2/Server/Plugins/SSLCA.py index 0d51adf18..b5cc11aa4 100644 --- a/src/lib/Bcfg2/Server/Plugins/SSLCA.py +++ b/src/lib/Bcfg2/Server/Plugins/SSLCA.py @@ -362,7 +362,8 @@ class SSLCA(Bcfg2.Server.Plugin.GroupSpool): """ The SSLCA generator handles the creation and management of ssl certificates and their keys. """ __author__ = 'g.hagger@gmail.com' - es_cls = lambda self, *args: SSLCAEntrySet(*args, parent=self) + # python 2.5 doesn't support mixing *magic and keyword arguments + es_cls = lambda self, *args: SSLCAEntrySet(*args, **dict(parent=self)) es_child_cls = SSLCADataFile def get_ca(self, name): diff --git a/src/sbin/bcfg2-lint b/src/sbin/bcfg2-lint index 959a2d8ed..430c4c54f 100755 --- a/src/sbin/bcfg2-lint +++ b/src/sbin/bcfg2-lint @@ -51,7 +51,8 @@ def run_plugin(plugin, plugin_name, setup=None, errorhandler=None, else: args.append(setup) - return plugin(*args, files=files, errorhandler=errorhandler).Run() + # python 2.5 doesn't support mixing *magic and keyword arguments + return plugin(*args, **dict(files=files, errorhandler=errorhandler)).Run() def get_errorhandler(setup): -- cgit v1.2.3-1-g7c22