diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2018-06-25 22:03:49 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2018-06-25 22:03:49 +0100 |
| commit | 4fdb6fb6aebfba933ee8b07ff395d236180b5d67 (patch) | |
| tree | b1fbec5b963c6bd6b76b41763ce6efb1d153d6c9 /libstdc++-v3 | |
| parent | b36bc89e32a52ac41b6b68d834c7692b890741e6 (diff) | |
| download | gcc-4fdb6fb6aebfba933ee8b07ff395d236180b5d67.zip gcc-4fdb6fb6aebfba933ee8b07ff395d236180b5d67.tar.gz gcc-4fdb6fb6aebfba933ee8b07ff395d236180b5d67.tar.bz2 | |
PR libstdc++/86112 fix printers for Python 2.6
Dict comprehensions are only supported since Python 2.7, so use an
alternative syntax that is backwards compatible.
PR libstdc++/86112
* python/libstdcxx/v6/printers.py (add_one_template_type_printer):
Replace dict comprehension.
From-SVN: r262115
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/python/libstdcxx/v6/printers.py | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 288a929..eb79e81 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,9 @@ 2018-06-25 Jonathan Wakely <jwakely@redhat.com> + PR libstdc++/86112 + * python/libstdcxx/v6/printers.py (add_one_template_type_printer): + Replace dict comprehension. + PR libstdc++/81092 * config/abi/post/powerpc64-linux-gnu/baseline_symbols.txt: Update. diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py index 45aaa12..34d8b4e 100644 --- a/libstdc++-v3/python/libstdcxx/v6/printers.py +++ b/libstdc++-v3/python/libstdcxx/v6/printers.py @@ -1438,7 +1438,8 @@ def add_one_template_type_printer(obj, name, defargs): if _versioned_namespace: # Add second type printer for same type in versioned namespace: ns = 'std::' + _versioned_namespace - defargs = { n: d.replace('std::', ns) for n,d in defargs.items() } + # PR 86112 Cannot use dict comprehension here: + defargs = dict((n, d.replace('std::', ns)) for (n,d) in defargs.items()) printer = TemplateTypePrinter(ns+name, defargs) gdb.types.register_type_printer(obj, printer) |