s4-python-samba: 'file' is a built-in
authorKamen Mazdrashki <kamenim@samba.org>
Tue, 28 Sep 2010 22:53:22 +0000 (01:53 +0300)
committerKamen Mazdrashki <kamenim@samba.org>
Sat, 2 Oct 2010 22:24:55 +0000 (01:24 +0300)
source4/scripting/python/samba/__init__.py

index f698b9a6a6748d79b1f38daacb64122fc0e5aa31..f249708ea2c595204f5be4b75058f1af8b8abe3e 100644 (file)
@@ -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)