diff options
Diffstat (limited to 'giscanner')
-rw-r--r-- | giscanner/annotationmain.py | 21 | ||||
-rw-r--r-- | giscanner/annotationparser.py | 1 | ||||
-rw-r--r-- | giscanner/ast.py | 1 | ||||
-rw-r--r-- | giscanner/cachestore.py | 1 | ||||
-rw-r--r-- | giscanner/codegen.py | 1 | ||||
-rw-r--r-- | giscanner/collections/__init__.py | 1 | ||||
-rw-r--r-- | giscanner/docmain.py | 1 | ||||
-rw-r--r-- | giscanner/docwriter.py | 1 | ||||
-rw-r--r-- | giscanner/dumper.py | 5 | ||||
-rw-r--r-- | giscanner/gdumpparser.py | 1 | ||||
-rw-r--r-- | giscanner/girparser.py | 1 | ||||
-rw-r--r-- | giscanner/girwriter.py | 3 | ||||
-rw-r--r-- | giscanner/introspectablepass.py | 1 | ||||
-rw-r--r-- | giscanner/libtoolimporter.py | 1 | ||||
-rw-r--r-- | giscanner/maintransformer.py | 3 | ||||
-rw-r--r-- | giscanner/message.py | 1 | ||||
-rwxr-xr-x | giscanner/scannermain.py | 10 | ||||
-rw-r--r-- | giscanner/sectionparser.py | 1 | ||||
-rw-r--r-- | giscanner/shlibs.py | 1 | ||||
-rw-r--r-- | giscanner/sourcescanner.py | 5 | ||||
-rw-r--r-- | giscanner/testcodegen.py | 1 | ||||
-rw-r--r-- | giscanner/transformer.py | 3 | ||||
-rw-r--r-- | giscanner/utils.py | 1 | ||||
-rwxr-xr-x | giscanner/xmlwriter.py | 1 |
24 files changed, 46 insertions, 21 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 |