summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2010-06-18 12:50:15 +0200
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-16 15:10:40 +0100
commitc4fde248b14d4be9cab6d0eff85f9d7f852a4b65 (patch)
tree0462a7b4c188f390af53d2b1a6312894774d740f
parent2fc283c52d7d6d6bf8e67a7847f064fa20d4bc51 (diff)
downloadpoky-c4fde248b14d4be9cab6d0eff85f9d7f852a4b65.tar.gz
*: use print() as a function
to make python3 happy (Bitbake rev: c82926ccdd4ec4e3ad6e78a381dacb96adf9b409) Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rwxr-xr-xbitbake/bin/bitbake6
-rw-r--r--bitbake/doc/manual/usermanual.xml4
-rw-r--r--bitbake/lib/bb/msg.py10
3 files changed, 10 insertions, 10 deletions
diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index fdf1e20f84..7caa5d95e6 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -195,13 +195,13 @@ Default BBFILES are the .bb files in the current directory.""")
195 uimodule = __import__("bb.ui", fromlist = [ui]) 195 uimodule = __import__("bb.ui", fromlist = [ui])
196 ui_init = getattr(uimodule, ui).init 196 ui_init = getattr(uimodule, ui).init
197 except AttributeError: 197 except AttributeError:
198 print "FATAL: Invalid user interface '%s' specified. " % ui 198 print("FATAL: Invalid user interface '%s' specified. " % ui)
199 print "Valid interfaces are 'ncurses', 'depexp' or the default, 'knotty'." 199 print("Valid interfaces are 'ncurses', 'depexp' or the default, 'knotty'.")
200 else: 200 else:
201 try: 201 try:
202 return_value = ui_init(serverConnection.connection, serverConnection.events) 202 return_value = ui_init(serverConnection.connection, serverConnection.events)
203 except Exception as e: 203 except Exception as e:
204 print "FATAL: Unable to start to '%s' UI: %s" % (ui, e) 204 print("FATAL: Unable to start to '%s' UI: %s" % (ui, e))
205 raise 205 raise
206 finally: 206 finally:
207 serverConnection.terminate() 207 serverConnection.terminate()
diff --git a/bitbake/doc/manual/usermanual.xml b/bitbake/doc/manual/usermanual.xml
index 7b87ad837f..748ac319ef 100644
--- a/bitbake/doc/manual/usermanual.xml
+++ b/bitbake/doc/manual/usermanual.xml
@@ -218,8 +218,8 @@ python myclass_eventhandler() {
218 from bb.event import getName 218 from bb.event import getName
219 from bb import data 219 from bb import data
220 220
221 print "The name of the Event is %s" % getName(e) 221 print("The name of the Event is %s" % getName(e))
222 print "The file we run for is %s" % data.getVar('FILE', e.data, True) 222 print("The file we run for is %s" % data.getVar('FILE', e.data, True))
223} 223}
224</screen></para><para> 224</screen></para><para>
225This 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>) 225This 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/bitbake/lib/bb/msg.py b/bitbake/lib/bb/msg.py
index cea5efb5a4..8d2bcce452 100644
--- a/bitbake/lib/bb/msg.py
+++ b/bitbake/lib/bb/msg.py
@@ -110,7 +110,7 @@ def debug(level, msgdomain, msg, fn = None):
110 if debug_level[msgdomain] >= level: 110 if debug_level[msgdomain] >= level:
111 bb.event.fire(MsgDebug(msg), None) 111 bb.event.fire(MsgDebug(msg), None)
112 if not bb.event._ui_handlers: 112 if not bb.event._ui_handlers:
113 print('DEBUG: ' + msg) 113 print('DEBUG: %s' % (msg))
114 114
115def note(level, msgdomain, msg, fn = None): 115def note(level, msgdomain, msg, fn = None):
116 if not msgdomain: 116 if not msgdomain:
@@ -119,20 +119,20 @@ def note(level, msgdomain, msg, fn = None):
119 if level == 1 or verbose or debug_level[msgdomain] >= 1: 119 if level == 1 or verbose or debug_level[msgdomain] >= 1:
120 bb.event.fire(MsgNote(msg), None) 120 bb.event.fire(MsgNote(msg), None)
121 if not bb.event._ui_handlers: 121 if not bb.event._ui_handlers:
122 print('NOTE: ' + msg) 122 print('NOTE: %s' % (msg))
123 123
124def warn(msgdomain, msg, fn = None): 124def warn(msgdomain, msg, fn = None):
125 bb.event.fire(MsgWarn(msg), None) 125 bb.event.fire(MsgWarn(msg), None)
126 if not bb.event._ui_handlers: 126 if not bb.event._ui_handlers:
127 print('WARNING: ' + msg) 127 print('WARNING: %s' % (msg))
128 128
129def error(msgdomain, msg, fn = None): 129def error(msgdomain, msg, fn = None):
130 bb.event.fire(MsgError(msg), None) 130 bb.event.fire(MsgError(msg), None)
131 print 'ERROR: ' + msg 131 print('ERROR: %s' % (msg))
132 132
133def fatal(msgdomain, msg, fn = None): 133def fatal(msgdomain, msg, fn = None):
134 bb.event.fire(MsgFatal(msg), None) 134 bb.event.fire(MsgFatal(msg), None)
135 print('FATAL: ' + msg) 135 print('FATAL: %s' % (msg))
136 sys.exit(1) 136 sys.exit(1)
137 137
138def plain(msg, fn = None): 138def plain(msg, fn = None):