Ticket #4397: precedence-patch.diff

trac/prefs/web_ui.py

@@ -108 +108 @@
                     req.session.change_sid(val)
                 else:
                     req.session[field] = val
-            elif field in req.args and req.session:
+            elif field in req.args and field in req.session:
                 del req.session[field]
 
     def _do_load(self, req):

trac/ticket/web_ui.py

@@ -492 +492 @@
                 return None
             kind, verb = status_map[status]
             title = html('Ticket ', html.em('#', id, title=summary),
-                         type and ' (%s) ' % type or '', verb)
+                         (type and ' (%s) ' % type) or '', verb)
             ticket_href = req.href.ticket(id)
             if cid:
                 ticket_href += '#comment:' + cid

trac/ticket/query.py

@@ -526 +526 @@
                 email = req.session.get('email')
                 name = req.session.get('name')
                 if email or name:
-                    constraints['cc'] = ('~%s' % email or name,)
+                    constraints['cc'] = ('~%s' % (email or name),)
 
         query = Query(self.env, constraints, req.args.get('order'),
                       req.args.has_key('desc'), req.args.get('group'),

trac/versioncontrol/api.py

@@ -121 +121 @@
 class NoSuchNode(TracError):
     def __init__(self, path, rev, msg=None):
         TracError.__init__(self, "%sNo node %s at revision %s" \
-                           % (msg and '%s: ' % msg or '', path, rev))
+                           % ((msg and '%s: ' % msg) or '', path, rev))
 
 class Repository(object):
     """Base class for a repository provided by a version control system."""

trac/wiki/formatter.py

@@ -538 +538 @@
             self.close_indentation() # FIXME: why not lists in quotes?
             self._list_stack.append((new_type, depth))
             self._set_tab(depth)
-            class_attr = list_class and ' class="%s"' % list_class or ''
-            start_attr = start and ' start="%s"' % start or ''
+            class_attr = (list_class and ' class="%s"' % list_class) or ''
+            start_attr = (start and ' start="%s"' % start) or ''
             self.out.write('<'+new_type+class_attr+start_attr+'><li>')
         def close_list(tp):
             self._list_stack.pop()