diff -r f627ab500fda -r 5ad3154a8810 devtools/repotest.py --- a/devtools/repotest.py Mon May 02 20:41:46 2011 +0200 +++ b/devtools/repotest.py Tue May 10 18:50:13 2011 +0200 @@ -371,8 +371,13 @@ _orig_select_principal = rqlannotation._select_principal def _select_principal(scope, relations): + def sort_key(something): + try: + return something.r_type + except AttributeError: + return (something[0].r_type, something[1]) return _orig_select_principal(scope, relations, - _sort=lambda rels: sorted(rels, key=lambda x: x.r_type)) + _sort=lambda rels: sorted(rels, key=sort_key)) try: from cubicweb.server.msplanner import PartPlanInformation