From: Greg Hudson <ghudson@mit.edu>
Date: Sat, 17 Dec 2011 05:01:32 +0000 (+0000)
Subject: Avoid using itertools.permutations in k5test
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2240347dd3cd3f1f9a068a22df037f2428c7bd7f;p=krb5.git

Avoid using itertools.permutations in k5test

k5test is only supposed to require Python 2.4, but cross_realms uses
itertools.permutations which is new in 2.6.  Use a list display
instead.

ticket: 7054

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25592 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/util/k5test.py b/src/util/k5test.py
index 0e7c30b62..60c19acb2 100644
--- a/src/util/k5test.py
+++ b/src/util/k5test.py
@@ -314,7 +314,6 @@ command-line flags.  These are documented in the --help output.
 """
 
 import atexit
-import itertools
 import optparse
 import os
 import shlex
@@ -979,7 +978,8 @@ def cross_realms(num, xtgts=None, args=None, **keywords):
 
     if xtgts is None:
         # Default to cross tgts for every pair of realms.
-        xtgts = frozenset(itertools.permutations(range(num), 2))
+        # (itertools.permutations would work here but is new in 2.6.)
+        xtgts = [(x,y) for x in range(num) for y in range(num) if x != y]
 
     # Create the realms.
     realms = []