From c3c6eb14f1d8b250322f63fb6b6adc3fb60c67eb Mon Sep 17 00:00:00 2001 From: jblum Date: Thu, 14 Aug 2008 19:20:58 +0000 Subject: [PATCH] changed glcanvas test (fedora fix) git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9292 221aa14e-8319-0410-a670-987f0aec2ac5 --- gr-wxgui/src/python/fftsink2.py | 5 ++--- gr-wxgui/src/python/scopesink2.py | 5 ++--- gr-wxgui/src/python/waterfallsink2.py | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/gr-wxgui/src/python/fftsink2.py b/gr-wxgui/src/python/fftsink2.py index ad2a09c9..2d8364aa 100644 --- 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 5eee3efd..4d9f33af 100644 --- 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 21519304..c8a4436c 100644 --- 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: -- 2.39.5