[Commit-gnuradio] r9292 - gnuradio/trunk/gr-wxgui/src/python

[jblum]

Author: jblum
Date: 2008-08-14 13:20:58 -0600 (Thu, 14 Aug 2008)
New Revision: 9292

Modified:
   gnuradio/trunk/gr-wxgui/src/python/fftsink2.py
   gnuradio/trunk/gr-wxgui/src/python/scopesink2.py
   gnuradio/trunk/gr-wxgui/src/python/waterfallsink2.py
Log:
changed glcanvas test (fedora fix)

Modified: gnuradio/trunk/gr-wxgui/src/python/fftsink2.py
===================================================================
--- gnuradio/trunk/gr-wxgui/src/python/fftsink2.py      2008-08-14 18:43:49 UTC 
(rev 9291)
+++ gnuradio/trunk/gr-wxgui/src/python/fftsink2.py      2008-08-14 19:20:58 UTC 
(rev 9292)
@@ -32,9 +32,8 @@
     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:

Modified: gnuradio/trunk/gr-wxgui/src/python/scopesink2.py
===================================================================
--- gnuradio/trunk/gr-wxgui/src/python/scopesink2.py    2008-08-14 18:43:49 UTC 
(rev 9291)
+++ gnuradio/trunk/gr-wxgui/src/python/scopesink2.py    2008-08-14 19:20:58 UTC 
(rev 9292)
@@ -32,9 +32,8 @@
     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:

Modified: gnuradio/trunk/gr-wxgui/src/python/waterfallsink2.py
===================================================================
--- gnuradio/trunk/gr-wxgui/src/python/waterfallsink2.py        2008-08-14 
18:43:49 UTC (rev 9291)
+++ gnuradio/trunk/gr-wxgui/src/python/waterfallsink2.py        2008-08-14 
19:20:58 UTC (rev 9292)
@@ -32,9 +32,8 @@
     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: