From: Nicolas Marie-Magdelaine <redacted>
Date: Thu, 21 Jun 2018 14:39:37 +0000 (+0200)
Subject: Merge branch 'master' into master
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=d63eb5a515809e5c3912fb8b6e634b846644e3ef;p=redacted-XKCD-password-generator.git

Merge branch 'master' into master
---

d63eb5a515809e5c3912fb8b6e634b846644e3ef
diff --cc xkcdpass/xkcd_password.py
index 894e586,fe4d8a8..9195e2f
--- a/xkcdpass/xkcd_password.py
+++ b/xkcdpass/xkcd_password.py
@@@ -273,9 -274,10 +280,10 @@@ CASE_METHODS = {"alternating": alternat
                  "upper": upper_case,
                  "lower": lower_case,
                  "random": random_case,
 -                "first": first_upper_case,
 -                }
 +                "capitalize":capitalize_case}
 +
  
+ 
  def set_case(words, method="lower", testing=False):
      """
      Perform capitalization on some or all of the strings in `words`.