summaryrefslogtreecommitdiff
path: root/ctdb/wscript
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2018-11-19 12:05:29 +0100
committerStefan Metzmacher <metze@samba.org>2018-12-05 13:35:19 +0100
commit8ba0a9a1abb8bbe1df5ff808645adf305bc4e0b3 (patch)
tree24b6feb736e1ad62302ae7a305dc5bc78688fe4a /ctdb/wscript
parenta83e4a24abd4116c78b7fa775b7f05511d843481 (diff)
downloadsamba-8ba0a9a1abb8bbe1df5ff808645adf305bc4e0b3.tar.gz
ctdb/wscript: use python 3.6 compatible functions
Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'ctdb/wscript')
-rw-r--r--ctdb/wscript5
1 files changed, 3 insertions, 2 deletions
diff --git a/ctdb/wscript b/ctdb/wscript
index baf660fadf6..3f8081ec3e8 100644
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -340,7 +340,7 @@ def configure(conf):
Logs.info(" %s: no" % (m))
def gen_ctdb_version(task):
- fp = file(task.outputs[0].bldpath(task.env), 'w')
+ fp = open(task.outputs[0].bldpath(task.env), 'w')
fp.write('/* This file is auto-generated from waf */\n')
fp.write('#include "version.h"\n')
fp.write('\n')
@@ -786,7 +786,8 @@ def build(bld):
def SUBDIR_MODE(path, trim_path=None):
pd = {'trim_path': trim_path, 'file_list': []}
- os.path.walk(path, SUBDIR_MODE_callback, pd)
+ for dirname, _subdirs, fnames in os.walk(path):
+ SUBDIR_MODE_callback(pd, dirname, fnames)
return pd['file_list']
event_script_subdirs = [