Ticket #4276: lorem_words.diff

django/contrib/webdesign/lorem_ipsum.py

@@ -57 +57 @@
         word_list = list(COMMON_WORDS)
     else:
         word_list = []
-    c = len(word_list)
-    if count > c:
-        count = min(count - c, len(WORDS))
-        word_list += random.sample(WORDS, count - c)
+    remaining = count - len(word_list)
+    print remaining, len(WORDS)
+    if remaining < 0:
+        word_list = word_list[:count]
+    elif remaining <= len(WORDS):
+        word_list += random.sample(WORDS, remaining)
     else:
-        word_list = word_list[:count]
+        extra_words = list(WORDS * (remaining // len(WORDS))) \
+                      + random.sample(WORDS, remaining % len(WORDS))
+        random.shuffle(extra_words)
+        word_list += extra_words
     return ' '.join(word_list)