[gtk-doc] mkdb: Mark multiple Unicode strings as such
- From: Stefan Sauer <stefkost src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-doc] mkdb: Mark multiple Unicode strings as such
- Date: Thu, 26 Oct 2017 18:42:03 +0000 (UTC)
commit 21358879180c9e988fc0473840ab8ab673f69513
Author: Christoph Reiter <reiter christoph gmail com>
Date: Wed Oct 25 21:27:05 2017 +0200
mkdb: Mark multiple Unicode strings as such
These are utf-8 encoded byte strings under Python 2 and when concatonated
with unicode objects get auto-decoded using the default ascii encoding,
which fails as they are not ascii.
https://bugzilla.gnome.org/show_bug.cgi?id=787862
gtkdoc/mkdb.py | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gtkdoc/mkdb.py b/gtkdoc/mkdb.py
index 6c1538f..7bb6d3e 100644
--- a/gtkdoc/mkdb.py
+++ b/gtkdoc/mkdb.py
@@ -2784,14 +2784,14 @@ def MakeHashXRef(symbol, tag):
if '::' in symbol:
o, s = symbol.split('::', 1)
symbol = '%s-%s' % (o, s)
- text = '“' + s + '”'
+ text = u'“' + s + u'”'
# If the symbol is in the form "Object:property", then change the symbol to
# "Object--property" and use "property" as the text.
if ':' in symbol:
o, p = symbol.split(':', 1)
symbol = '%s--%s' % (o, p)
- text = '“' + p + '”'
+ text = u'“' + p + u'”'
if tag != '':
text = tagify(text, tag)
@@ -3311,7 +3311,7 @@ def GetSignals(gobject):
symbol = '%s::%s' % (gobject, name)
sid = common.CreateValidSGMLID('%s-%s' % (gobject, name))
- desc += "<refsect2 id=\"%s\" role=\"signal\"><title>The <literal>“%s”</literal>
signal</title>\n" % (
+ desc += u"<refsect2 id=\"%s\" role=\"signal\"><title>The <literal>“%s”</literal>
signal</title>\n" % (
sid, name)
desc += MakeIndexterms(symbol, sid)
desc += "\n"
@@ -3546,13 +3546,13 @@ def GetArgs(gobject):
arg_synop = "<row><entry role=\"property_type\">%s</entry><entry role=\"property_name\"><link
linkend=\"%s\">%s</link></entry><entry role=\"property_flags\">%s</entry></row>\n" % (
type_output, sid, name, flags_string)
- arg_desc = "<refsect2 id=\"%s\" role=\"property\"><title>The <literal>“%s”</literal>
%s</title>\n" % (
+ arg_desc = u"<refsect2 id=\"%s\" role=\"property\"><title>The <literal>“%s”</literal>
%s</title>\n" % (
sid, name, kind)
arg_desc += MakeIndexterms(symbol, sid)
arg_desc += "\n"
arg_desc += OutputSymbolExtraLinks(symbol)
- arg_desc += "<programlisting> “%s”%s %s</programlisting>\n" % (name, pad1, type_output)
+ arg_desc += u"<programlisting> “%s”%s %s</programlisting>\n" % (name, pad1, type_output)
arg_desc += blurb
if symbol in SymbolAnnotations:
param_desc = SymbolAnnotations[symbol]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]