From 0cb476fb26f450950c73c5df5223edc736ceb651 Mon Sep 17 00:00:00 2001 From: Kamen Mazdrashki Date: Wed, 29 Sep 2010 01:53:22 +0300 Subject: s4-python-samba: 'file' is a built-in --- source4/scripting/python/samba/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source4/scripting/python') diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py index f698b9a6a6..f249708ea2 100644 --- a/source4/scripting/python/samba/__init__.py +++ b/source4/scripting/python/samba/__init__.py @@ -260,13 +260,13 @@ def check_all_substituted(text): raise Exception("Not all variables substituted: %s" % text[var_start:var_end+1]) -def read_and_sub_file(file, subst_vars): +def read_and_sub_file(file_name, subst_vars): """Read a file and sub in variables found in it - :param file: File to be read (typically from setup directory) + :param file_name: File to be read (typically from setup directory) param subst_vars: Optional variables to subsitute in the file. """ - data = open(file, 'r').read() + data = open(file_name, 'r').read() if subst_vars is not None: data = substitute_var(data, subst_vars) check_all_substituted(data) -- cgit