diff options
| author | Kamen Mazdrashki <kamenim@samba.org> | 2010-09-29 01:53:22 +0300 |
|---|---|---|
| committer | Kamen Mazdrashki <kamenim@samba.org> | 2010-10-03 01:24:55 +0300 |
| commit | 0cb476fb26f450950c73c5df5223edc736ceb651 (patch) | |
| tree | 8bf46e47d79251ed91ef789ccfda34d9d05ad4b3 /source4/scripting/python | |
| parent | edfb8c64f60bb56d0dc9124f2aebd21ed9d1188a (diff) | |
| download | samba-0cb476fb26f450950c73c5df5223edc736ceb651.tar.gz samba-0cb476fb26f450950c73c5df5223edc736ceb651.tar.bz2 samba-0cb476fb26f450950c73c5df5223edc736ceb651.zip | |
s4-python-samba: 'file' is a built-in
Diffstat (limited to 'source4/scripting/python')
| -rw-r--r-- | source4/scripting/python/samba/__init__.py | 6 |
1 files changed, 3 insertions, 3 deletions
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) |