changed glcanvas test (fedora fix)

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9292 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/gr-wxgui/src/python/fftsink2.py b/gr-wxgui/src/python/fftsink2.py
index ad2a09c96edd6b8770885bf2ba81d7855546c115..2d8364aaad571759614a597d14d90eb987696a89 100644 (file)
--- a/gr-wxgui/src/python/fftsink2.py
+++ b/gr-wxgui/src/python/fftsink2.py
@@ -32,9 +32,8 @@ if style == 'nongl':
     from fftsink_nongl import fft_sink_f, fft_sink_c
 elif style == 'gl':
     try:
-        import wx
-        wx.glcanvas.GLCanvas
-    except AttributeError:
+        import wx.glcanvas
+    except ImportError:
         raise RuntimeError("wxPython doesn't support glcanvas")
 
     try:

diff --git a/gr-wxgui/src/python/scopesink2.py b/gr-wxgui/src/python/scopesink2.py
index 5eee3efd59e9ec2394ebc9338c1310c959c99faf..4d9f33afcde0c23a6c2e7eaeaceba52e813e1d7e 100644 (file)
--- a/gr-wxgui/src/python/scopesink2.py
+++ b/gr-wxgui/src/python/scopesink2.py
@@ -32,9 +32,8 @@ if style == 'nongl':
     from scopesink_nongl import scope_sink_f, scope_sink_c
 elif style == 'gl':
     try:
-        import wx
-        wx.glcanvas.GLCanvas
-    except AttributeError:
+        import wx.glcanvas
+    except ImportError:
         raise RuntimeError("wxPython doesn't support glcanvas")
 
     try:

diff --git a/gr-wxgui/src/python/waterfallsink2.py b/gr-wxgui/src/python/waterfallsink2.py
index 21519304458e23718c603625349827b684d66d35..c8a4436c73d06f70097bd37fd761800e75a0602b 100644 (file)
--- a/gr-wxgui/src/python/waterfallsink2.py
+++ b/gr-wxgui/src/python/waterfallsink2.py
@@ -32,9 +32,8 @@ if style == 'nongl':
     from waterfallsink_nongl import waterfall_sink_f, waterfall_sink_c
 elif style == 'gl':
     try:
-        import wx
-        wx.glcanvas.GLCanvas
-    except AttributeError:
+        import wx.glcanvas
+    except ImportError:
         raise RuntimeError("wxPython doesn't support glcanvas")
 
     try: