Parcourir la source

*: use print() as a function

to make python3 happy

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Bernhard Reutner-Fischer il y a 14 ans
Parent
commit
c82926ccdd
4 fichiers modifiés avec 12 ajouts et 12 suppressions
  1. 3 3
      bin/bitbake
  2. 2 2
      doc/manual/usermanual.xml
  3. 2 2
      ez_setup.py
  4. 5 5
      lib/bb/msg.py

+ 3 - 3
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()

+ 2 - 2
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>)

+ 2 - 2
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"""

+ 5 - 5
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):