gentpl.py: Use python3-style print function

diff --git a/ChangeLog b/ChangeLog
index c5dadaeccdedebcad8256741f316247f07644938..c680ba1b509bee1ba72d4fdcf31e41be2d41f398 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-05  Mike Gilbert  <floppym@gentoo.org>
+
+       * INSTALL: Raise minimum python version to 2.6.
+       * gentpl.py: Use python3-style print function.
+
 2013-12-05  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/grub-install.c: Mention Boot* variable.

diff --git a/INSTALL b/INSTALL
index 7602323b117183cd0b09426d80b781ea6db2c179..b91d975c3a34743cb6d5b59af22e0df8d6b71acb 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -54,7 +54,7 @@ To build GRUB's graphical terminal (gfxterm), you need:
 If you use a development snapshot or want to hack on GRUB you may
 need the following.
 
-* Python 2.5.2 or later
+* Python 2.6 or later
 * Autoconf 2.60 or later
 * Automake 1.10.1 or later
 

diff --git a/gentpl.py b/gentpl.py
index 1d4583c6846574609af60ac881c9104e336a6107..02bf3352333c89eb50785bc583272db1dfd43c6b 100644 (file)
--- a/gentpl.py
+++ b/gentpl.py
@@ -15,6 +15,8 @@
 #  You should have received a copy of the GNU General Public License
 #  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
 
+from __future__ import print_function
+
 __metaclass__ = type
 
 from optparse import OptionParser
@@ -434,7 +436,7 @@ def output(s, section=''):
 
 def write_output(section=''):
     for s in outputs.get(section, []):
-        print s,
+        print(s, end='')
 
 #
 # Global variables