diff options
author | Thomas Nagy <tnagy1024@gmail.com> | 2010-04-08 07:45:46 +1000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2010-04-08 07:46:39 +1000 |
commit | 7f3116a63d7d91f4c0d26adf8fcdef0a5a957971 (patch) | |
tree | 46e95f69b7637c38dbbc20455c3dc99408a93df7 /lib | |
parent | 64957ce0686761acd2a2a7ec1787898d2d8238b6 (diff) | |
download | samba-7f3116a63d7d91f4c0d26adf8fcdef0a5a957971.tar.gz samba-7f3116a63d7d91f4c0d26adf8fcdef0a5a957971.tar.bz2 samba-7f3116a63d7d91f4c0d26adf8fcdef0a5a957971.zip |
build: allow the waf build to work with python 3.0 and 3.1
Python 3.x is a bit fussier about print statements and indentation.
Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/socket_wrapper/wscript | 6 | ||||
-rw-r--r-- | lib/util/wscript_configure | 2 | ||||
-rw-r--r-- | lib/wscript_build | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/lib/socket_wrapper/wscript b/lib/socket_wrapper/wscript index 6d9a95795d..aa00e591d1 100644 --- a/lib/socket_wrapper/wscript +++ b/lib/socket_wrapper/wscript @@ -8,9 +8,7 @@ def set_options(opt): action="store_true", dest='enable_socket_wrapper', default=False) def configure(conf): - if (Options.options.enable_socket_wrapper or - Options.options.developer or - Options.options.enable_selftest): + if (Options.options.enable_socket_wrapper or Options.options.developer or Options.options.enable_selftest): conf.DEFINE('SOCKET_WRAPPER', 1) - conf.ADD_GLOBAL_DEPENDENCY('SOCKET_WRAPPER') + conf.ADD_GLOBAL_DEPENDENCY('SOCKET_WRAPPER') diff --git a/lib/util/wscript_configure b/lib/util/wscript_configure index 8bd196f8d3..ae3a4f2e05 100644 --- a/lib/util/wscript_configure +++ b/lib/util/wscript_configure @@ -68,7 +68,7 @@ for (define, msg, code, headers) in statfs_types: break if not found_statfs: - print "FATAL: Failed to find a statfs method" + print("FATAL: Failed to find a statfs method") raise diff --git a/lib/wscript_build b/lib/wscript_build index 9892fd646b..55ca7537c8 100644 --- a/lib/wscript_build +++ b/lib/wscript_build @@ -10,7 +10,7 @@ external_libs = { list = [] -for module, package in external_libs.iteritems(): +for module, package in external_libs.items(): try: __import__(module) except ImportError: |