server/migractions.py
changeset 7845 2172978be237
parent 7797 a71618a75b53
parent 7815 2a164a9cf81c
child 7894 ad0eeb0f7a8d
--- a/server/migractions.py	Fri Sep 23 09:17:37 2011 +0200
+++ b/server/migractions.py	Fri Sep 23 14:18:13 2011 +0200
@@ -161,7 +161,7 @@
                   migrscript, funcname, *args, **kwargs)
         except ExecutionError, err:
             print >> sys.stderr, "-> %s" % err
-        except:
+        except BaseException:
             self.rollback()
             raise
 
@@ -1374,7 +1374,7 @@
             prop = self.rqlexec(
                 'CWProperty X WHERE X pkey %(k)s, NOT X for_user U',
                 {'k': pkey}, ask_confirm=False).get_entity(0, 0)
-        except:
+        except Exception:
             self.cmd_create_entity('CWProperty', pkey=unicode(pkey), value=value)
         else:
             prop.set_attributes(value=value)
@@ -1492,14 +1492,14 @@
         if not ask_confirm or self.confirm('Execute sql: %s ?' % sql):
             try:
                 cu = self.session.system_sql(sql, args)
-            except:
+            except Exception:
                 ex = sys.exc_info()[1]
                 if self.confirm('Error: %s\nabort?' % ex, pdb=True):
                     raise
                 return
             try:
                 return cu.fetchall()
-            except:
+            except Exception:
                 # no result to fetch
                 return