From: Steven Tobin <redacted>
Date: Wed, 8 Nov 2023 17:37:29 +0000 (+0000)
Subject: Merge pull request #144 from chkpnt/as-is-case
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=f16e6f792ac74ed2a264c632fd2d616def09023b;p=redacted-XKCD-password-generator.git

Merge pull request #144 from chkpnt/as-is-case

as-is case
---

f16e6f792ac74ed2a264c632fd2d616def09023b
diff --cc tests/test_xkcdpass.py
index 0a84005,529455b..5a036f1
--- a/tests/test_xkcdpass.py
+++ b/tests/test_xkcdpass.py
@@@ -48,14 -48,8 +48,14 @@@ class XkcdPasswordTests(unittest.TestCa
              delimiter=tdelim)
          self.assertIsNotNone(re.match('([a-z]+(_|$))+', result))
  
 +    def test_random_delimiter(self):
 +        wordlist = xkcd_password.generate_wordlist(WORDFILE, min_length=3, max_length=3)
 +        result = xkcd_password.generate_xkcdpassword(wordlist, numwords=3, random_delimiters=True)
 +
 +        self.assertEqual(11, len(result))
 +
      def test_set_case(self):
-         words = "this is only a test".lower().split()
+         words = "this is only a GREAT Test".lower().split()
          words_before = set(words)
  
          results = {}
diff --cc xkcdpass/xkcd_password.py
index 9cb7f4b,43bdb67..5c66216
--- a/xkcdpass/xkcd_password.py
+++ b/xkcdpass/xkcd_password.py
@@@ -368,11 -381,13 +381,12 @@@ def randomized_delimiter_join(words, de
      Join the words into a password with random delimiters between each word
      """
  
 -    final_passwd = ''
 -    for word in words:
 +    final_passwd = words[0]
 +    for word in words[1:]:
          final_passwd += choose_delimiter(delimiters) + word
 -
 -    return final_passwd + choose_delimiter(delimiters)
 +    return final_passwd
  
+ 
  def choose_delimiter(delimiters):
      """
      Choose a random delimiter from the list