diff -r e6eb0c7c2e98 -r 10942ed172de devtools/repotest.py --- a/devtools/repotest.py Tue Sep 08 18:04:57 2015 +0200 +++ b/devtools/repotest.py Tue Sep 15 16:15:03 2015 +0200 @@ -307,8 +307,8 @@ variantes = _orig_build_variantes(self, newsolutions) sortedvariantes = [] for variante in variantes: - orderedkeys = sorted((k[1], k[2], v) for k, v in variante.iteritems()) - variante = DumbOrderedDict(sorted(variante.iteritems(), + orderedkeys = sorted((k[1], k[2], v) for k, v in variante.items()) + variante = DumbOrderedDict(sorted(variante.items(), lambda a, b: cmp((a[0][1],a[0][2],a[1]), (b[0][1],b[0][2],b[1])))) sortedvariantes.append( (orderedkeys, variante) ) @@ -319,7 +319,7 @@ def _check_permissions(*args, **kwargs): res, restricted = _orig_check_permissions(*args, **kwargs) - res = DumbOrderedDict(sorted(res.iteritems(), lambda a, b: cmp(a[1], b[1]))) + res = DumbOrderedDict(sorted(res.items(), lambda a, b: cmp(a[1], b[1]))) return res, restricted def _dummy_check_permissions(self, rqlst):