From 06166e54cea2302bf9213f18881495eb2b5d089d Mon Sep 17 00:00:00 2001
From: Simon Feltman <sfeltman@src.gnome.org>
Date: Mon, 28 Apr 2014 15:34:14 -0700
Subject: giscanner: Use print as a function for Python 3 compatibility

Use future import "print_function" and update relevant uses of print
as a function call. See: PEP 3105

https://bugzilla.gnome.org/show_bug.cgi?id=679438
---
 giscanner/annotationmain.py                     | 21 +++++++++++----------
 giscanner/annotationparser.py                   |  1 +
 giscanner/ast.py                                |  1 +
 giscanner/cachestore.py                         |  1 +
 giscanner/codegen.py                            |  1 +
 giscanner/collections/__init__.py               |  1 +
 giscanner/docmain.py                            |  1 +
 giscanner/docwriter.py                          |  1 +
 giscanner/dumper.py                             |  5 +++--
 giscanner/gdumpparser.py                        |  1 +
 giscanner/girparser.py                          |  1 +
 giscanner/girwriter.py                          |  3 ++-
 giscanner/introspectablepass.py                 |  1 +
 giscanner/libtoolimporter.py                    |  1 +
 giscanner/maintransformer.py                    |  3 ++-
 giscanner/message.py                            |  1 +
 giscanner/scannermain.py                        | 10 ++++++----
 giscanner/sectionparser.py                      |  1 +
 giscanner/shlibs.py                             |  1 +
 giscanner/sourcescanner.py                      |  5 +++--
 giscanner/testcodegen.py                        |  1 +
 giscanner/transformer.py                        |  3 ++-
 giscanner/utils.py                              |  1 +
 giscanner/xmlwriter.py                          |  1 +
 misc/update-glib-annotations.py                 |  7 ++++---
 misc/verbump.py                                 |  7 ++++---
 tests/offsets/gen-gitestoffsets                 |  6 ++++--
 tests/scanner/annotationparser/test_parser.py   |  1 +
 tests/scanner/annotationparser/test_patterns.py |  1 +
 tests/scanner/test_sourcescanner.py             |  1 +
 tests/scanner/test_transformer.py               |  1 +
 tests/warn/warningtester.py                     |  1 +
 tools/g-ir-tool-template.in                     |  3 ++-
 33 files changed, 65 insertions(+), 30 deletions(-)

diff --git a/giscanner/annotationmain.py b/giscanner/annotationmain.py
index 874cd23c..190269e2 100644
--- a/giscanner/annotationmain.py
+++ b/giscanner/annotationmain.py
@@ -20,6 +20,7 @@
 
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 import optparse
 
@@ -64,16 +65,16 @@ def annotation_main(args):
         parser = GtkDocCommentBlockParser()
         writer = GtkDocCommentBlockWriter(indent=False)
         blocks = parser.parse_comment_blocks(ss.get_comments())
-        print '/' + ('*' * 60) + '/'
-        print '/* THIS FILE IS GENERATED DO NOT EDIT */'
-        print '/' + ('*' * 60) + '/'
-        print
+        print('/' + ('*' * 60) + '/')
+        print('/* THIS FILE IS GENERATED DO NOT EDIT */')
+        print('/' + ('*' * 60) + '/')
+        print('')
         for block in sorted(blocks.values()):
-            print writer.write(block)
-            print
-        print
-        print '/' + ('*' * 60) + '/'
-        print '/* THIS FILE IS GENERATED DO NOT EDIT */'
-        print '/' + ('*' * 60) + '/'
+            print(writer.write(block))
+            print('')
+        print('')
+        print('/' + ('*' * 60) + '/')
+        print('/* THIS FILE IS GENERATED DO NOT EDIT */')
+        print('/' + ('*' * 60) + '/')
 
     return 0
diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py
index 60c96b89..99502b28 100644
--- a/giscanner/annotationparser.py
+++ b/giscanner/annotationparser.py
@@ -109,6 +109,7 @@ Refer to the `GTK-Doc manual`_ for more detailed usage information.
 
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 import os
 import re
diff --git a/giscanner/ast.py b/giscanner/ast.py
index 9d118fd1..fe1a2e57 100644
--- a/giscanner/ast.py
+++ b/giscanner/ast.py
@@ -21,6 +21,7 @@
 
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 import copy
 from itertools import chain
diff --git a/giscanner/cachestore.py b/giscanner/cachestore.py
index c1ea4e89..4f5e6f2b 100644
--- a/giscanner/cachestore.py
+++ b/giscanner/cachestore.py
@@ -20,6 +20,7 @@
 
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 import errno
 import cPickle
diff --git a/giscanner/codegen.py b/giscanner/codegen.py
index 9e00e261..3138ac2a 100644
--- a/giscanner/codegen.py
+++ b/giscanner/codegen.py
@@ -21,6 +21,7 @@
 from __future__ import with_statement
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 from contextlib import contextmanager
 
diff --git a/giscanner/collections/__init__.py b/giscanner/collections/__init__.py
index 0c7f0b0c..5ab935f3 100644
--- a/giscanner/collections/__init__.py
+++ b/giscanner/collections/__init__.py
@@ -20,6 +20,7 @@
 
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 from .counter import Counter
 from .ordereddict import OrderedDict
diff --git a/giscanner/docmain.py b/giscanner/docmain.py
index 3152f1b8..a9f6904c 100644
--- a/giscanner/docmain.py
+++ b/giscanner/docmain.py
@@ -20,6 +20,7 @@
 
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 import os
 import argparse
diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py
index 9f7ebc97..70f83efe 100644
--- a/giscanner/docwriter.py
+++ b/giscanner/docwriter.py
@@ -23,6 +23,7 @@
 
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 import os
 import re
diff --git a/giscanner/dumper.py b/giscanner/dumper.py
index 9e5ba9e0..40877f8f 100644
--- a/giscanner/dumper.py
+++ b/giscanner/dumper.py
@@ -21,6 +21,7 @@
 
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 import os
 import sys
@@ -294,8 +295,8 @@ class DumpCompiler(object):
             # libtool: Run the assembled link command, we don't use distutils
             # for linking here.
             if not self._options.quiet:
-                print "g-ir-scanner: link: %s" % (
-                    subprocess.list2cmdline(args), )
+                print("g-ir-scanner: link: %s" % (
+                    subprocess.list2cmdline(args), ))
                 sys.stdout.flush()
             msys = os.environ.get('MSYSTEM', None)
             if msys:
diff --git a/giscanner/gdumpparser.py b/giscanner/gdumpparser.py
index 8773e883..7b154a8e 100644
--- a/giscanner/gdumpparser.py
+++ b/giscanner/gdumpparser.py
@@ -20,6 +20,7 @@
 
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 import os
 import sys
diff --git a/giscanner/girparser.py b/giscanner/girparser.py
index bfa0ac09..2e198ce1 100644
--- a/giscanner/girparser.py
+++ b/giscanner/girparser.py
@@ -20,6 +20,7 @@
 
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 import os
 
diff --git a/giscanner/girwriter.py b/giscanner/girwriter.py
index a3447060..aafedc64 100644
--- a/giscanner/girwriter.py
+++ b/giscanner/girwriter.py
@@ -22,6 +22,7 @@
 from __future__ import with_statement
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 from . import ast
 from .xmlwriter import XMLWriter
@@ -118,7 +119,7 @@ class GIRWriter(XMLWriter):
         elif isinstance(node, ast.Constant):
             self._write_constant(node)
         else:
-            print 'WRITER: Unhandled node', node
+            print('WRITER: Unhandled node', node)
 
     def _append_version(self, node, attrs):
         if node.version:
diff --git a/giscanner/introspectablepass.py b/giscanner/introspectablepass.py
index 8880b379..859118e3 100644
--- a/giscanner/introspectablepass.py
+++ b/giscanner/introspectablepass.py
@@ -18,6 +18,7 @@
 #
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 from . import ast
 from . import message
diff --git a/giscanner/libtoolimporter.py b/giscanner/libtoolimporter.py
index 6ae4ec37..6507696a 100644
--- a/giscanner/libtoolimporter.py
+++ b/giscanner/libtoolimporter.py
@@ -20,6 +20,7 @@
 
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 import imp
 import os
diff --git a/giscanner/maintransformer.py b/giscanner/maintransformer.py
index c8288536..72909b34 100644
--- a/giscanner/maintransformer.py
+++ b/giscanner/maintransformer.py
@@ -19,6 +19,7 @@
 
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 import re
 
@@ -825,7 +826,7 @@ class MainTransformer(object):
         try:
             self._adjust_container_type(parent, field, tag.annotations)
         except AttributeError as ex:
-            print ex
+            print(ex)
 
     def _apply_annotations_property(self, parent, prop):
         prefix = self._get_annotation_name(parent)
diff --git a/giscanner/message.py b/giscanner/message.py
index 117f1957..b4321072 100644
--- a/giscanner/message.py
+++ b/giscanner/message.py
@@ -22,6 +22,7 @@
 
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 import os
 import sys
diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
index 63df7264..b2b286f5 100755
--- a/giscanner/scannermain.py
+++ b/giscanner/scannermain.py
@@ -22,6 +22,7 @@
 
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 import errno
 import optparse
@@ -345,8 +346,8 @@ def extract_filelist(options):
 
 def create_namespace(options):
     if options.strip_prefix:
-        print """g-ir-scanner: warning: Option --strip-prefix has been deprecated;
-see --identifier-prefix and --symbol-prefix."""
+        print("""g-ir-scanner: warning: Option --strip-prefix has been deprecated;
+see --identifier-prefix and --symbol-prefix.""")
         options.identifier_prefixes.append(options.strip_prefix)
 
     # We do this dance because the empty list has different semantics from
@@ -549,8 +550,9 @@ def scanner_main(args):
         message.fatal("warnings configured as fatal")
         return 1
     elif warning_count > 0 and options.warn_all is False:
-        print ("g-ir-scanner: %s: warning: %d warnings suppressed (use --warn-all to see them)"
-               % (transformer.namespace.name, warning_count, ))
+        print("g-ir-scanner: %s: warning: %d warnings suppressed "
+              "(use --warn-all to see them)" %
+              (transformer.namespace.name, warning_count, ))
 
     # Write out AST
     if options.packages_export:
diff --git a/giscanner/sectionparser.py b/giscanner/sectionparser.py
index 3ff3bf0f..69a685e0 100644
--- a/giscanner/sectionparser.py
+++ b/giscanner/sectionparser.py
@@ -19,6 +19,7 @@
 
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 import re
 from . import ast
diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
index cd90cfb5..1115f5cf 100644
--- a/giscanner/shlibs.py
+++ b/giscanner/shlibs.py
@@ -21,6 +21,7 @@
 
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 import os
 import platform
diff --git a/giscanner/sourcescanner.py b/giscanner/sourcescanner.py
index 8f145028..b6f2dc4d 100644
--- a/giscanner/sourcescanner.py
+++ b/giscanner/sourcescanner.py
@@ -21,6 +21,7 @@
 from __future__ import with_statement
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 import os
 import subprocess
@@ -273,9 +274,9 @@ class SourceScanner(object):
         return self._scanner.get_comments()
 
     def dump(self):
-        print '-' * 30
+        print('-' * 30)
         for symbol in self._scanner.get_symbols():
-            print symbol.ident, symbol.base_type.name, symbol.type
+            print(symbol.ident, symbol.base_type.name, symbol.type)
 
     # Private
 
diff --git a/giscanner/testcodegen.py b/giscanner/testcodegen.py
index b827a2d8..ab46e923 100644
--- a/giscanner/testcodegen.py
+++ b/giscanner/testcodegen.py
@@ -20,6 +20,7 @@
 
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 from StringIO import StringIO
 from . import ast
diff --git a/giscanner/transformer.py b/giscanner/transformer.py
index abead495..2542440a 100644
--- a/giscanner/transformer.py
+++ b/giscanner/transformer.py
@@ -20,6 +20,7 @@
 
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 import os
 import sys
@@ -381,7 +382,7 @@ raise ValueError."""
         elif stype == CSYMBOL_TYPE_OBJECT:
             pass
         else:
-            print 'transformer: unhandled symbol: %r' % (symbol, )
+            print('transformer: unhandled symbol: %r' % (symbol, ))
 
     def _enum_common_prefix(self, symbol):
         def common_prefix(a, b):
diff --git a/giscanner/utils.py b/giscanner/utils.py
index d03ca3e0..c40a6ffd 100644
--- a/giscanner/utils.py
+++ b/giscanner/utils.py
@@ -19,6 +19,7 @@
 #
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 import errno
 import re
diff --git a/giscanner/xmlwriter.py b/giscanner/xmlwriter.py
index 535bb6eb..0c734a33 100755
--- a/giscanner/xmlwriter.py
+++ b/giscanner/xmlwriter.py
@@ -21,6 +21,7 @@
 from __future__ import with_statement
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 import os
 
diff --git a/misc/update-glib-annotations.py b/misc/update-glib-annotations.py
index 34fd3e89..f523f926 100755
--- a/misc/update-glib-annotations.py
+++ b/misc/update-glib-annotations.py
@@ -5,6 +5,7 @@
 
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 import os
 import sys
@@ -67,7 +68,7 @@ if __name__ == '__main__':
     else:
         builddir = srcdir
 
-    print "Using source directory: %r build directory: %r" % (srcdir, builddir)
+    print("Using source directory: %r build directory: %r" % (srcdir, builddir))
 
     modules = [{'name':         'glib',
                 'srcname':      '../gir/glib-2.0.c',
@@ -104,6 +105,6 @@ if __name__ == '__main__':
         srcfile.close()
         os.rename(tmpname, srcname)
 
-        print "Updated %r" % (srcname, )
+        print("Updated %r" % (srcname, ))
 
-    print "Done; run \"git diff\" to see any changes."
+    print("Done; run \"git diff\" to see any changes.")
diff --git a/misc/verbump.py b/misc/verbump.py
index 0db54452..679ef065 100644
--- a/misc/verbump.py
+++ b/misc/verbump.py
@@ -5,6 +5,7 @@
 
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 import re
 import os
@@ -38,13 +39,13 @@ for line in f:
     continue
   v = int(m.group(1))
   newv = v+1
-  print "Will update micro version from %s to %s" % (v, newv)
+  print("Will update micro version from %s to %s" % (v, newv))
   newf.write(micro_version_replace % (newv, ))
 newf.close()
 
 os.rename(configure_path + '.tmp', configure_path)
-print "Successfully wrote new 'configure.ac' with post-release version bump"
+print("Successfully wrote new 'configure.ac' with post-release version bump")
 
 args=['git', 'commit', '-m', "configure: Post-release version bump", configure_path]
-print "Running: %r" % (args, )
+print("Running: %r" % (args, ))
 subprocess.check_call(args)
diff --git a/tests/offsets/gen-gitestoffsets b/tests/offsets/gen-gitestoffsets
index 77351060..94a2062d 100755
--- a/tests/offsets/gen-gitestoffsets
+++ b/tests/offsets/gen-gitestoffsets
@@ -19,6 +19,8 @@
 # 02110-1301, USA.
 #
 
+from __future__ import print_function
+
 # The idea here is that we want to compare offset information two ways:
 #
 #  1) As generated by the compiler
@@ -34,7 +36,7 @@ import re
 import sys
 
 if len(sys.argv) != 2:
-    print >>sys.stderr, "Usage: gen-gitestoffsets INPUT > OUTPUT"
+    print("Usage: gen-gitestoffsets INPUT > OUTPUT", file=sys.stderr)
     sys.exit(1)
 
 # Helper function that we use to generate source. It does substitions
@@ -86,7 +88,7 @@ for m in STRUCT_DEF_RE.finditer(input):
             continue
         n = FIELD_RE.match(line)
         if not n:
-            print sys.stderr, "Can't parse structure line '%s'" % line
+            print("Can't parse structure line '%s'" % line, file=sys.stderr)
             sys.exit(1)
         fields.append(n.group(1))
 
diff --git a/tests/scanner/annotationparser/test_parser.py b/tests/scanner/annotationparser/test_parser.py
index 17eb12b3..2cec9f11 100644
--- a/tests/scanner/annotationparser/test_parser.py
+++ b/tests/scanner/annotationparser/test_parser.py
@@ -27,6 +27,7 @@ Tests ensuring annotationparser.py continues to function correctly.
 
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 import difflib
 import os
diff --git a/tests/scanner/annotationparser/test_patterns.py b/tests/scanner/annotationparser/test_patterns.py
index 1648a08b..7d430940 100644
--- a/tests/scanner/annotationparser/test_patterns.py
+++ b/tests/scanner/annotationparser/test_patterns.py
@@ -31,6 +31,7 @@ against the expected output.
 
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 from giscanner.annotationparser import (COMMENT_BLOCK_START_RE, COMMENT_BLOCK_END_RE,
                                         COMMENT_ASTERISK_RE, INDENTATION_RE, EMPTY_LINE_RE,
diff --git a/tests/scanner/test_sourcescanner.py b/tests/scanner/test_sourcescanner.py
index 0f1e4837..a47485e2 100644
--- a/tests/scanner/test_sourcescanner.py
+++ b/tests/scanner/test_sourcescanner.py
@@ -1,5 +1,6 @@
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 import unittest
 import tempfile
diff --git a/tests/scanner/test_transformer.py b/tests/scanner/test_transformer.py
index cf315809..1e75d688 100644
--- a/tests/scanner/test_transformer.py
+++ b/tests/scanner/test_transformer.py
@@ -1,5 +1,6 @@
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 import unittest
 import tempfile
diff --git a/tests/warn/warningtester.py b/tests/warn/warningtester.py
index 600260d2..e3d677a8 100644
--- a/tests/warn/warningtester.py
+++ b/tests/warn/warningtester.py
@@ -1,5 +1,6 @@
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 import __builtin__
 import os
diff --git a/tools/g-ir-tool-template.in b/tools/g-ir-tool-template.in
index b3eb29ab..b7aaf4f0 100644
--- a/tools/g-ir-tool-template.in
+++ b/tools/g-ir-tool-template.in
@@ -20,6 +20,7 @@
 #
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 import os
 import sys
 import __builtin__
@@ -36,7 +37,7 @@ if debug:
             pydevd.settrace()
     else:
         def on_exception(exctype, value, tb):
-            print "Caught exception: %r %r" % (exctype, value)
+            print("Caught exception: %r %r" % (exctype, value))
             import pdb
             pdb.pm()
         sys.excepthook = on_exception
-- 
cgit v1.2.1