Run 2to3 on all wscript files.

Automatically upgrading to python3 syntax, where possible.

common/wscript

@@ -273,7 +273,7 @@ def build(bld):
         clientlib.env.append_value("LINKFLAGS", "-lnsl -lsocket")
 
     if bld.env['BUILD_WITH_32_64']:
-        print "create 32bit lib..."
+        print("create 32bit lib...")
         clientlib32bit = clientlib.clone('lib32')
   
     create_jack_process_obj(bld, 'netmanager', 'JackNetManager.cpp', serverlib)

dbus/wscript

@@ -13,12 +13,12 @@ def configure(conf):
     conf.env['BUILD_JACKDBUS'] = False
 
     if not conf.check_cfg(package='dbus-1', atleast_version='1.0.0', args='--cflags --libs') or not conf.is_defined('HAVE_DBUS_1'):
-        print Logs.colors.RED + 'WARNING !! jackdbus will not be built because libdbus-dev is missing' + Logs.colors.NORMAL
+        print(Logs.colors.RED + 'WARNING !! jackdbus will not be built because libdbus-dev is missing' + Logs.colors.NORMAL)
         return
 
     dbus_dir = conf.check_cfg(package='dbus-1', args='--variable=session_bus_services_dir')
     if not dbus_dir:
-        print Logs.colors.RED + 'WARNING !! jackdbus will not be built because service dir is unknown' + Logs.colors.NORMAL
+        print(Logs.colors.RED + 'WARNING !! jackdbus will not be built because service dir is unknown' + Logs.colors.NORMAL)
         return
 
     dbus_dir = dbus_dir.strip()
@@ -36,7 +36,7 @@ def configure(conf):
     if conf.is_defined('HAVE_EXPAT'):
         conf.env['LIB_EXPAT'] = ['expat']
     else:
-        print Logs.colors.RED + 'WARNING !! jackdbus will not be built because of expat is missing' + Logs.colors.NORMAL
+        print(Logs.colors.RED + 'WARNING !! jackdbus will not be built because of expat is missing' + Logs.colors.NORMAL)
         return
 
     conf.env['BUILD_JACKDBUS'] = True

example-clients/wscript

@@ -63,7 +63,7 @@ def build(bld):
         os_incdir = ['../macosx', '../posix']
     if bld.env['IS_SUN']:
         os_incdir = ['../solaris', '../posix']
-    for example_program, example_program_source in example_programs.items():
+    for example_program, example_program_source in list(example_programs.items()):
         if example_program == 'jack_server_control':
             uselib_local = 'serverlib'
         elif example_program == 'jack_net_slave':
@@ -151,7 +151,7 @@ def build(bld):
  	    prog.uselib_local = 'clientlib'
  	    prog.target = 'alsa_out'
 
-    for example_lib, example_lib_source in example_libs.items():
+    for example_lib, example_lib_source in list(example_libs.items()):
         lib = bld.new_task_gen('cc', 'shlib')
         lib.env['shlib_PATTERN'] = '%s.so'
         lib.includes = os_incdir + ['../common/jack', '../common']
@@ -168,4 +168,4 @@ def build(bld):
 
     bld.symlink_as('${PREFIX}/bin/jack_disconnect', 'jack_connect')
 
-    bld.install_files('${PREFIX}/bin', 'jack_control', chmod=0755)
+    bld.install_files('${PREFIX}/bin', 'jack_control', chmod=0o755)

tests/wscript

@@ -14,7 +14,7 @@ test_programs = {
     }
 
 def build(bld):
-    for test_program, test_program_sources in test_programs.items():
+    for test_program, test_program_sources in list(test_programs.items()):
         prog = bld.new_task_gen('cxx', 'program')
         prog.features.append('cc')
         if bld.env['IS_MACOSX']:

wscript

@@ -4,7 +4,7 @@
 import os
 import Utils
 import Options
-import commands
+import subprocess
 g_maxlen = 40
 import shutil
 import Task
@@ -24,10 +24,10 @@ def display_msg(msg, status = None, color = None):
     global g_maxlen
     g_maxlen = max(g_maxlen, len(msg))
     if status:
-        print "%s :" % msg.ljust(g_maxlen),
+        print("%s :" % msg.ljust(g_maxlen), end=' ')
         Utils.pprint(color, status)
     else:
-        print "%s" % msg.ljust(g_maxlen)
+        print("%s" % msg.ljust(g_maxlen))
 
 def display_feature(msg, build):
     if build:
@@ -238,17 +238,17 @@ def configure(conf):
             conf.env['LIBDIR'] = conf.env['PREFIX'] + '/lib32'
         conf.write_config_header('config.h')
 
-    print
+    print()
     display_msg("==================")
     version_msg = "JACK " + VERSION
     if svnrev:
         version_msg += " exported from r" + svnrev
     else:
         version_msg += " svn revision will checked and eventually updated during build"
-    print version_msg
+    print(version_msg)
 
-    print "Build with a maximum of %d JACK clients" % conf.env['CLIENT_NUM']
-    print "Build with a maximum of %d ports per application" % conf.env['PORT_NUM_FOR_CLIENT']
+    print("Build with a maximum of %d JACK clients" % conf.env['CLIENT_NUM'])
+    print("Build with a maximum of %d ports per application" % conf.env['PORT_NUM_FOR_CLIENT'])
  
     display_msg("Install prefix", conf.env['PREFIX'], 'CYAN')
     display_msg("Library directory", conf.env['LIBDIR'], 'CYAN')
@@ -265,8 +265,8 @@ def configure(conf):
     display_feature('Build D-Bus JACK (jackdbus)', conf.env['BUILD_JACKDBUS'])
 
     if conf.env['BUILD_JACKDBUS'] and conf.env['BUILD_JACKD']:
-        print Logs.colors.RED + 'WARNING !! mixing both jackd and jackdbus may cause issues:' + Logs.colors.NORMAL
-        print Logs.colors.RED + 'WARNING !! jackdbus does not use .jackdrc nor qjackctl settings' + Logs.colors.NORMAL
+        print(Logs.colors.RED + 'WARNING !! mixing both jackd and jackdbus may cause issues:' + Logs.colors.NORMAL)
+        print(Logs.colors.RED + 'WARNING !! jackdbus does not use .jackdrc nor qjackctl settings' + Logs.colors.NORMAL)
 
     if conf.env['IS_LINUX']:
         display_feature('Build with ALSA support', conf.env['BUILD_DRIVER_ALSA'] == True)
@@ -278,21 +278,21 @@ def configure(conf):
         #display_msg('Settings persistence', xxx)
 
         if conf.env['DBUS_SERVICES_DIR'] != conf.env['DBUS_SERVICES_DIR_REAL']:
-            print
-            print Logs.colors.RED + "WARNING: D-Bus session services directory as reported by pkg-config is"
-            print Logs.colors.RED + "WARNING:",
-            print Logs.colors.CYAN + conf.env['DBUS_SERVICES_DIR_REAL']
-            print Logs.colors.RED + 'WARNING: but service file will be installed in'
-            print Logs.colors.RED + "WARNING:",
-            print Logs.colors.CYAN + conf.env['DBUS_SERVICES_DIR']
-            print Logs.colors.RED + 'WARNING: You may need to adjust your D-Bus configuration after installing jackdbus'
-            print 'WARNING: You can override dbus service install directory'
-            print 'WARNING: with --enable-pkg-config-dbus-service-dir option to this script'
-            print Logs.colors.NORMAL,
-    print
+            print()
+            print(Logs.colors.RED + "WARNING: D-Bus session services directory as reported by pkg-config is")
+            print(Logs.colors.RED + "WARNING:", end=' ')
+            print(Logs.colors.CYAN + conf.env['DBUS_SERVICES_DIR_REAL'])
+            print(Logs.colors.RED + 'WARNING: but service file will be installed in')
+            print(Logs.colors.RED + "WARNING:", end=' ')
+            print(Logs.colors.CYAN + conf.env['DBUS_SERVICES_DIR'])
+            print(Logs.colors.RED + 'WARNING: You may need to adjust your D-Bus configuration after installing jackdbus')
+            print('WARNING: You can override dbus service install directory')
+            print('WARNING: with --enable-pkg-config-dbus-service-dir option to this script')
+            print(Logs.colors.NORMAL, end=' ')
+    print()
 
 def build(bld):
-    print ("make[1]: Entering directory `" + os.getcwd() + "/" + blddir + "'" )
+    print(("make[1]: Entering directory `" + os.getcwd() + "/" + blddir + "'" ))
     if not os.access('svnversion.h', os.R_OK):
         create_svnversion_task(bld)