Fix "x if y else z" syntax for python2.4.

[jelmer/dulwich-libgit2.git] / dulwich / tests / test_objects.py

diff --git a/dulwich/tests/test_objects.py b/dulwich/tests/test_objects.py
index e3179b2e81bc7dc7bc0d5251763ebe4d744cfae7..c3b4c69544c9014eb98dcfe0eeaf91c18f6e8ca2 100644 (file)
--- a/dulwich/tests/test_objects.py
+++ b/dulwich/tests/test_objects.py
@@ -68,12 +68,14 @@ except ImportError:
     # Implementation of permutations from Python 2.6 documentation:
     # http://docs.python.org/2.6/library/itertools.html#itertools.permutations
     # Copyright (c) 2001-2010 Python Software Foundation; All Rights Reserved
+    # Modified syntax slightly to run under Python 2.4.
     def permutations(iterable, r=None):
         # permutations('ABCD', 2) --> AB AC AD BA BC BD CA CB CD DA DB DC
         # permutations(range(3)) --> 012 021 102 120 201 210
         pool = tuple(iterable)
         n = len(pool)
-        r = n if r is None else r
+        if r is None:
+            r = n
         if r > n:
             return
         indices = range(n)