cubicweb: comparison server/migractions.py

equal deleted inserted replaced

-:9a6db1eb12ff
+:965395d821bc
 newgroups = list(erschema.get_groups(action))
 for geid, gname in self.rqlexec('Any G, GN WHERE T %s G, G name GN, '
 'T eid %%(x)s' % perm, {'x': teid}, 'x',
 ask_confirm=False):
 if not gname in newgroups:
-if not confirm or self.confirm('remove %s permission of %s to %s?'
+if not confirm or self.confirm('Remove %s permission of %s to %s?'
 % (action, erschema, gname)):
 self.rqlexec('DELETE T %s G WHERE G eid %%(x)s, T eid %s'
 % (perm, teid),
 {'x': geid}, 'x', ask_confirm=False)
 else:
 newgroups.remove(gname)
 for gname in newgroups:
-if not confirm or self.confirm('grant %s permission of %s to %s?'
+if not confirm or self.confirm('Grant %s permission of %s to %s?'
 % (action, erschema, gname)):
 self.rqlexec('SET T %s G WHERE G eid %%(x)s, T eid %s'
 % (perm, teid),
 {'x': gm[gname]}, 'x', ask_confirm=False)
 # handle rql expressions
 newexprs = dict((expr.expression, expr) for expr in erschema.get_rqlexprs(action))
 for expreid, expression in self.rqlexec('Any E, EX WHERE T %s E, E expression EX, '
 'T eid %s' % (perm, teid),
 ask_confirm=False):
 if not expression in newexprs:
-if not confirm or self.confirm('remove %s expression for %s permission of %s?'
+if not confirm or self.confirm('Remove %s expression for %s permission of %s?'
 % (expression, action, erschema)):
 # deleting the relation will delete the expression entity
 self.rqlexec('DELETE T %s E WHERE E eid %%(x)s, T eid %s'
 % (perm, teid),
 {'x': expreid}, 'x', ask_confirm=False)
 else:
 newexprs.pop(expression)
 for expression in newexprs.values():
 expr = expression.expression
-if not confirm or self.confirm('add %s expression for %s permission of %s?'
+if not confirm or self.confirm('Add %s expression for %s permission of %s?'
 % (expr, action, erschema)):
 self.rqlexec('INSERT RQLExpression X: X exprtype %%(exprtype)s, '
 'X expression %%(expr)s, X mainvars %%(vars)s, T %s X '
 'WHERE T eid %%(x)s' % perm,
 {'expr': expr, 'exprtype': exprtype,
 # base actions ############################################################
 def checkpoint(self, ask_confirm=True):
 """checkpoint action"""
-if not ask_confirm or self.confirm('commit now ?', shell=False):
+if not ask_confirm or self.confirm('Commit now ?', shell=False):
 self.commit()
 def cmd_add_cube(self, cube, update_database=True):
 self.cmd_add_cubes( (cube,), update_database)
 """execute the given sql if confirmed
 should only be used for low level stuff undoable with existing higher
 level actions
 """
-if not ask_confirm or self.confirm('execute sql: %s ?' % sql):
+if not ask_confirm or self.confirm('Execute sql: %s ?' % sql):
 self.session.set_pool() # ensure pool is set
 try:
 cu = self.session.system_sql(sql, args)
 except:
 ex = sys.exc_info()[1]
-if self.confirm('error: %s\nabort?' % ex):
+if self.confirm('Error: %s\nabort?' % ex):
 raise
 return
 try:
 return cu.fetchall()
 except:
 for rql, kwargs in rql:
 if kwargs:
 msg = '%s (%s)' % (rql, kwargs)
 else:
 msg = rql
-if not ask_confirm or self.confirm('execute rql: %s ?' % msg):
+if not ask_confirm or self.confirm('Execute rql: %s ?' % msg):
 try:
 res = execute(rql, kwargs, cachekey)
 except Exception, ex:
-if self.confirm('error: %s\nabort?' % ex):
+if self.confirm('Error: %s\nabort?' % ex):
 raise
 return res
 def rqliter(self, rql, kwargs=None, ask_confirm=True):
 return ForRqlIterator(self, rql, None, ask_confirm)
 if kwargs:
 msg = '%s (%s)' % (rql, kwargs)
 else:
 msg = rql
 if self.ask_confirm:
-if not self._h.confirm('execute rql: %s ?' % msg):
+if not self._h.confirm('Execute rql: %s ?' % msg):
 raise StopIteration
 try:
 rset = self._h._cw.execute(rql, kwargs)
 except Exception, ex:
-if self._h.confirm('error: %s\nabort?' % ex):
+if self._h.confirm('Error: %s\nabort?' % ex):
 raise
 else:
 raise StopIteration
 self._rsetit = iter(rset)
 return self._rsetit.next()

branch	stable
changeset 4650	965395d821bc
parent 4640	1b83a25cf9f5
child 4695	4aaf87e7f79e