[Commit-gnuradio] r9281 - gnuradio/branches/developers/jblum/glwxgui/gr-wxgui/src/python

[jblum]

Author: jblum
Date: 2008-08-14 00:54:11 -0600 (Thu, 14 Aug 2008)
New Revision: 9281

Modified:
   gnuradio/branches/developers/jblum/glwxgui/gr-wxgui/src/python/fftsink2.py
   gnuradio/branches/developers/jblum/glwxgui/gr-wxgui/src/python/scopesink2.py
   
gnuradio/branches/developers/jblum/glwxgui/gr-wxgui/src/python/waterfallsink2.py
Log:
import wrapper exceptions

Modified: 
gnuradio/branches/developers/jblum/glwxgui/gr-wxgui/src/python/fftsink2.py
===================================================================
--- gnuradio/branches/developers/jblum/glwxgui/gr-wxgui/src/python/fftsink2.py  
2008-08-14 05:05:52 UTC (rev 9280)
+++ gnuradio/branches/developers/jblum/glwxgui/gr-wxgui/src/python/fftsink2.py  
2008-08-14 06:54:11 UTC (rev 9281)
@@ -33,13 +33,13 @@
 elif style == 'gl':
     try:
         import wx
-       wx.glcanvas.GLCanvas
-    except (ImportError, AttributeError, AssertionError):
+        wx.glcanvas.GLCanvas
+    except AttributeError:
         raise RuntimeError("wxPython doesn't support glcanvas")
-        
-    try:        
-       from OpenGL.GL import *
-    except (ImportError, AttributeError, AssertionError):
+
+    try:
+        from OpenGL.GL import *
+    except ImportError:
         raise RuntimeError("Unable to import OpenGL. Are Python wrappers for 
OpenGL installed?")
-        
+
     from fftsink_gl import fft_sink_f, fft_sink_c

Modified: 
gnuradio/branches/developers/jblum/glwxgui/gr-wxgui/src/python/scopesink2.py
===================================================================
--- 
gnuradio/branches/developers/jblum/glwxgui/gr-wxgui/src/python/scopesink2.py    
    2008-08-14 05:05:52 UTC (rev 9280)
+++ 
gnuradio/branches/developers/jblum/glwxgui/gr-wxgui/src/python/scopesink2.py    
    2008-08-14 06:54:11 UTC (rev 9281)
@@ -33,13 +33,13 @@
 elif style == 'gl':
     try:
         import wx
-       wx.glcanvas.GLCanvas
-    except (ImportError, AttributeError, AssertionError):
+        wx.glcanvas.GLCanvas
+    except AttributeError:
         raise RuntimeError("wxPython doesn't support glcanvas")
-        
-    try:        
-       from OpenGL.GL import *
-    except (ImportError, AttributeError, AssertionError):
+
+    try:
+        from OpenGL.GL import *
+    except ImportError:
         raise RuntimeError("Unable to import OpenGL. Are Python wrappers for 
OpenGL installed?")
-        
+
     from scopesink_gl import scope_sink_f, scope_sink_c

Modified: 
gnuradio/branches/developers/jblum/glwxgui/gr-wxgui/src/python/waterfallsink2.py
===================================================================
--- 
gnuradio/branches/developers/jblum/glwxgui/gr-wxgui/src/python/waterfallsink2.py
    2008-08-14 05:05:52 UTC (rev 9280)
+++ 
gnuradio/branches/developers/jblum/glwxgui/gr-wxgui/src/python/waterfallsink2.py
    2008-08-14 06:54:11 UTC (rev 9281)
@@ -33,13 +33,13 @@
 elif style == 'gl':
     try:
         import wx
-       wx.glcanvas.GLCanvas
-    except (ImportError, AttributeError, AssertionError):
+        wx.glcanvas.GLCanvas
+    except AttributeError:
         raise RuntimeError("wxPython doesn't support glcanvas")
-        
-    try:        
-       from OpenGL.GL import *
-    except (ImportError, AttributeError, AssertionError):
+
+    try:
+        from OpenGL.GL import *
+    except ImportError:
         raise RuntimeError("Unable to import OpenGL. Are Python wrappers for 
OpenGL installed?")
-        
+
     from waterfallsink_gl import waterfall_sink_f, waterfall_sink_c