From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 19 Nov 2018 11:05:29 +0000 (+0100)
Subject: ctdb/wscript: use python 3.6 compatible functions
X-Git-Tag: tdb-1.3.17~508
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=8ba0a9a1abb8bbe1df5ff808645adf305bc4e0b3

ctdb/wscript: use python 3.6 compatible functions

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

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 = [