From: Matthias Klose <doko@ubuntu.com>
Date: Sat, 28 Feb 2015 09:22:43 +0000 (+0000)
Subject: re PR libstdc++/65246 (libstdc++ pretty printers don't work anymore with Python3)
X-Git-Tag: releases/gcc-5.1.0~701
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f083b434c27face3cdf13c0f5b089d3f651956f3;p=thirdparty%2Fgcc.git

re PR libstdc++/65246 (libstdc++ pretty printers don't work anymore with Python3)

2015-02-28  Matthias Klose  <doko@ubuntu.com>

        PR libstdc++/65246
        * python/libstdcxx/v6/__init__.py: Use explicit relative imports.

From-SVN: r221076
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6f283c556ad0..093b318794e0 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-28  Matthias Klose  <doko@ubuntu.com>
+
+	PR libstdc++/65246
+	* python/libstdcxx/v6/__init__.py: Use explicit relative imports.
+
 2015-02-22  Jonathan Wakely  <jwakely@redhat.com>
 
 	* doc/xml/manual/status_cxx2011.xml: Remove duplicated information.
diff --git a/libstdc++-v3/python/libstdcxx/v6/__init__.py b/libstdc++-v3/python/libstdcxx/v6/__init__.py
index 59088402d0b1..de3aa728cebb 100644
--- a/libstdc++-v3/python/libstdcxx/v6/__init__.py
+++ b/libstdc++-v3/python/libstdcxx/v6/__init__.py
@@ -16,7 +16,7 @@
 import gdb
 
 # Load the pretty-printers.
-from printers import register_libstdcxx_printers
+from .printers import register_libstdcxx_printers
 register_libstdcxx_printers(gdb.current_objfile())
 
 # Load the xmethods if GDB supports them.
@@ -28,5 +28,5 @@ def gdb_has_xmethods():
         return False
 
 if gdb_has_xmethods():
-    from xmethods import register_libstdcxx_xmethods
+    from .xmethods import register_libstdcxx_xmethods
     register_libstdcxx_xmethods(gdb.current_objfile())