Merge e04e444 into 3790d3f

vispy · Mar 4, 2014 · a37048a · a37048a
2 parents 3790d3f + e04e444
commit a37048a
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/vispy/app/backends/__init__.py b/vispy/app/backends/__init__.py
@@ -63,7 +63,7 @@ def has_qt(requires_uic=False, return_which=False):
 def has_pyglet(return_which=False):
     try:
         from . import _pyglet  # noqa
-    except:
+    except Exception:
         which = None
         has = False
     else:
@@ -104,7 +104,7 @@ def has_glfw(return_why=False, return_which=False):
 def has_glut(return_which=False):
     try:
         from OpenGL import GLUT  # noqa
-    except:
+    except Exception:
         has = False
         which = None
     else:

diff --git a/vispy/app/backends/_glut.py b/vispy/app/backends/_glut.py
@@ -113,7 +113,7 @@ def _vispy_get_native_app(self):
                     argNames=())
                 text = ctypes.c_char_p("rgba stencil double samples=8 hidpi")
                 glutInitDisplayString(text)
-            except:
+            except Exception:
                 pass
         if not self._initialized:
             glut.glutInit()  # todo: maybe allow user to give args?

diff --git a/vispy/util/_testing.py b/vispy/util/_testing.py
@@ -155,7 +155,7 @@ def __enter__(self):
     def __exit__(self, type, value, traceback):
         try:
             self.c.close()
-        except:
+        except Exception:
             logger.warn('Failed to close canvas')
         return
 

diff --git a/vispy/util/event.py b/vispy/util/event.py
@@ -296,7 +296,7 @@ def __call__(self, *args, **kwds):
 
                 try:
                     cb(event)
-                except:
+                except Exception:
                     # get traceback and store (so we can do postmortem
                     # debugging)
                     type, value, tb = sys.exc_info()

diff --git a/vispy/util/tests/test_emitter_group.py b/vispy/util/tests/test_emitter_group.py
@@ -198,10 +198,10 @@ def record_event(self, ev, key=None):
             else:
                 try:
                     attrs[name] = copy.deepcopy(val)
-                except:
+                except Exception:
                     try:
                         attrs[name] = copy.copy(val)
-                    except:
+                    except Exception:
                         attrs[name] = val
         if key is None:
             self.result = ev, attrs

diff --git a/vispy/util/tests/test_event_emitter.py b/vispy/util/tests/test_event_emitter.py
@@ -106,7 +106,7 @@ def _pop_source(self):
             self.assert_result()  # checks event type
             assert False, \
                 "Should not be able to construct emitter with non-Event class"
-        except:
+        except Exception:
             pass
 
     def test_event_kwargs(self):
@@ -433,10 +433,10 @@ def record_event(self, ev, key=None):
             else:
                 try:
                     attrs[name] = copy.deepcopy(val)
-                except:
+                except Exception:
                     try:
                         attrs[name] = copy.copy(val)
-                    except:
+                    except Exception:
                         attrs[name] = val
         if key is None:
             self.result = ev, attrs