--- a/server/sources/pyrorql.py	Tue Sep 20 15:14:04 2011 +0200
+++ b/server/sources/pyrorql.py	Wed Sep 21 17:38:00 2011 +0200
@@ -226,7 +226,7 @@
                         self.cross_relations.remove(ertype)
                 else:
                     self.dont_cross_relations.remove(ertype)
-        except:
+        except Exception:
             self.error('while updating mapping consequently to removal of %s',
                        schemacfg)
 
@@ -275,7 +275,7 @@
                         entity = rset.get_entity(0, 0)
                         entity.complete(entity.e_schema.indexable_attributes())
                         source.index_entity(session, entity)
-                except:
+                except Exception:
                     self.exception('while updating %s with external id %s of source %s',
                                    etype, extid, self.uri)
                     continue
@@ -288,7 +288,7 @@
                         entity = session.entity_from_eid(eid, etype)
                         repo.delete_info(session, entity, self.uri, extid,
                                          scleanup=self.eid)
-                except:
+                except Exception:
                     self.exception('while updating %s with external id %s of source %s',
                                    etype, extid, self.uri)
                     continue
@@ -667,7 +667,7 @@
         value = const.eval(self.kwargs)
         try:
             return None, self._const_var[value]
-        except:
+        except Exception:
             var = self._varmaker.next()
             self.need_translation = True
             restr = '%s eid %s' % (var, self.visit_constant(const))