[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - solenv/gdb

[Michael Stahl]

 solenv/gdb/libreoffice/sw.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fa7ed011cdcd7030c4c84afcdf166b90faf60afa
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jul 24 18:23:22 2015 +0200

    gdb pretty printer for SwNodes fails on Python 3 due to "unicode"
    
    Change-Id: I8e4983a91d4f97a2a20fbeed89d4e0f186c35fad
    (cherry picked from commit f29ac1d91b12ab2f55d7ab7afce62238a59b8cba)
    Reviewed-on: https://gerrit.libreoffice.org/17372
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/solenv/gdb/libreoffice/sw.py b/solenv/gdb/libreoffice/sw.py
index 71445d5..eba82a8 100644
--- a/solenv/gdb/libreoffice/sw.py
+++ b/solenv/gdb/libreoffice/sw.py
@@ -213,7 +213,7 @@ class BigPtrArrayPrinter(object):
                 # accessing this is completely non-obvious...
                 # also, node.dynamic_cast(node.dynamic_type) is null?
                 value = "    TextNode " + \
-                  unicode(node.cast(node.dynamic_type).dereference()['m_Text'])
+                  six.text_type(node.cast(node.dynamic_type).dereference()['m_Text'])
             elif str(node.dynamic_type.target()) == "SwOLENode":
                 value = "     OLENode "
             elif str(node.dynamic_type.target()) == "SwGrfNode":