diff options
author | Simon Feltman <sfeltman@src.gnome.org> | 2014-04-28 16:21:35 -0700 |
---|---|---|
committer | Colin Walters <walters@verbum.org> | 2015-09-29 23:12:58 -0400 |
commit | d59b3827d2bb62c1ed4db8030ed9e8e753b7f52d (patch) | |
tree | 2ed3614ba3b281e4fd253d9e56897f49c5a9b3bf /giscanner/annotationparser.py | |
parent | 750060dc0211cfb5786ba39da7283e5885eac7ad (diff) | |
download | gobject-introspection-d59b3827d2bb62c1ed4db8030ed9e8e753b7f52d.tar.gz |
giscanner: Use unicode literals in all Python files
Add unicode_literals future import which turns any string literal
into a unicode string. Return unicode strings from the Python C extension
module. Force writing of annotations (g-ir-annotation-tool) to output utf8
encoded data to stdout.
This is an initial pass at following the "unicode sandwich"
model of programming (http://nedbatchelder.com/text/unipain.html)
needed for supporting Python 3.
https://bugzilla.gnome.org/show_bug.cgi?id=679438
Diffstat (limited to 'giscanner/annotationparser.py')
-rw-r--r-- | giscanner/annotationparser.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py index 09026a4c..cd6fa4fa 100644 --- a/giscanner/annotationparser.py +++ b/giscanner/annotationparser.py @@ -110,6 +110,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 +from __future__ import unicode_literals import os import re @@ -1125,9 +1126,10 @@ class GtkDocCommentBlockParser(object): for (comment, filename, lineno) in comments: try: comment_block = self.parse_comment_block(comment, filename, lineno) - except Exception: + except Exception as e: error('unrecoverable parse error, please file a GObject-Introspection bug' - 'report including the complete comment block at the indicated location.', + 'report including the complete comment block at the indicated location. %s' % + str(e), Position(filename, lineno)) continue |