summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/bitbake6
-rw-r--r--doc/manual/usermanual.xml4
-rw-r--r--ez_setup.py4
-rw-r--r--lib/bb/msg.py10
4 files changed, 12 insertions, 12 deletions
diff --git a/bin/bitbake b/bin/bitbake
index fdf1e20f8..7caa5d95e 100755
--- a/bin/bitbake
+++ b/bin/bitbake
@@ -195,13 +195,13 @@ Default BBFILES are the .bb files in the current directory.""")
uimodule = __import__("bb.ui", fromlist = [ui])
ui_init = getattr(uimodule, ui).init
except AttributeError:
- print "FATAL: Invalid user interface '%s' specified. " % ui
- print "Valid interfaces are 'ncurses', 'depexp' or the default, 'knotty'."
+ print("FATAL: Invalid user interface '%s' specified. " % ui)
+ print("Valid interfaces are 'ncurses', 'depexp' or the default, 'knotty'.")
else:
try:
return_value = ui_init(serverConnection.connection, serverConnection.events)
except Exception as e:
- print "FATAL: Unable to start to '%s' UI: %s" % (ui, e)
+ print("FATAL: Unable to start to '%s' UI: %s" % (ui, e))
raise
finally:
serverConnection.terminate()
diff --git a/doc/manual/usermanual.xml b/doc/manual/usermanual.xml
index 7b87ad837..748ac319e 100644
--- a/doc/manual/usermanual.xml
+++ b/doc/manual/usermanual.xml
@@ -218,8 +218,8 @@ python myclass_eventhandler() {
from bb.event import getName
from bb import data
- print "The name of the Event is %s" % getName(e)
- print "The file we run for is %s" % data.getVar('FILE', e.data, True)
+ print("The name of the Event is %s" % getName(e))
+ print("The file we run for is %s" % data.getVar('FILE', e.data, True))
}
</screen></para><para>
This event handler gets called every time an event is triggered. A global variable <varname>e</varname> is defined. <varname>e</varname>.data contains an instance of bb.data. With the getName(<varname>e</varname>)
diff --git a/ez_setup.py b/ez_setup.py
index 6c2d38f57..ff12a8555 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -230,8 +230,8 @@ def main(argv, version=DEFAULT_VERSION):
from setuptools.command.easy_install import main
main(argv)
else:
- print "Setuptools version",version,"or greater has been installed."
- print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)'
+ print("Setuptools version",version,"or greater has been installed.")
+ print('(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)')
def update_md5(filenames):
"""Update our built-in md5 registry"""
diff --git a/lib/bb/msg.py b/lib/bb/msg.py
index cea5efb5a..8d2bcce45 100644
--- a/lib/bb/msg.py
+++ b/lib/bb/msg.py
@@ -110,7 +110,7 @@ def debug(level, msgdomain, msg, fn = None):
if debug_level[msgdomain] >= level:
bb.event.fire(MsgDebug(msg), None)
if not bb.event._ui_handlers:
- print('DEBUG: ' + msg)
+ print('DEBUG: %s' % (msg))
def note(level, msgdomain, msg, fn = None):
if not msgdomain:
@@ -119,20 +119,20 @@ def note(level, msgdomain, msg, fn = None):
if level == 1 or verbose or debug_level[msgdomain] >= 1:
bb.event.fire(MsgNote(msg), None)
if not bb.event._ui_handlers:
- print('NOTE: ' + msg)
+ print('NOTE: %s' % (msg))
def warn(msgdomain, msg, fn = None):
bb.event.fire(MsgWarn(msg), None)
if not bb.event._ui_handlers:
- print('WARNING: ' + msg)
+ print('WARNING: %s' % (msg))
def error(msgdomain, msg, fn = None):
bb.event.fire(MsgError(msg), None)
- print 'ERROR: ' + msg
+ print('ERROR: %s' % (msg))
def fatal(msgdomain, msg, fn = None):
bb.event.fire(MsgFatal(msg), None)
- print('FATAL: ' + msg)
+ print('FATAL: %s' % (msg))
sys.exit(1)
def plain(msg, fn = None):