Python 3 fixes

git-svn-id: svn://localhost/ardour2/branches/3.0@10167 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 8061f71e1571164441927dd9253a7a86ca7150ca..eb5e61712c859052528d7d7e3827b712bb9c1b1f 100644 (file)
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -289,7 +289,7 @@ def _doPyp(infileName):
     if infileName == '-':
         fd = sys.stdin
     else:
-        fd = file(infileName)
+        fd = open(infileName)
     inLines = fd.readlines()
     if fd != sys.stdin:
         fd.close()
@@ -310,7 +310,7 @@ def _doPyp(infileName):
 def include_processor(task):
     infileName = task.inputs[0].srcpath()
     outfileName = os.path.join(out, task.outputs[0].bldpath())
-    fdOut = file (outfileName, "w")
+    fdOut = open (outfileName, "w")
     fdOut.write (_doPyp(infileName))
     fdOut.close ()
 

diff --git a/waf b/waf
index 72d68665cce8503f16d75815a2409a761a457d5b..182b4f84289b095e1eec64ae579390c1b2021cb1 100755 (executable)
Binary files a/waf and b/waf differ