diff --git a/diceware/__init__.py b/diceware/__init__.py index af0a84d5bc6fb4af9a1e5070413596ba4617e321..41221932a90635f6096472fcd766d4e8b723aeb0 100644 --- a/diceware/__init__.py +++ b/diceware/__init__.py @@ -110,12 +110,12 @@ def handle_options(args): "Get randomness from this source. Possible values: `%s'. " "Default: system" % "', `".join(sorted(random_sources)))) parser.add_argument( - '-w', '--wordlist', default='en_securedrop', choices=wordlist_names, + '-w', '--wordlist', default='en_eff', choices=wordlist_names, metavar="NAME", help=( "Use words from this wordlist. Possible values: `%s'. " "Wordlists are stored in the folder displayed below. " - "Default: en_securedrop" % "', `".join(wordlist_names))) + "Default: en_eff" % "', `".join(wordlist_names))) realdice_group = parser.add_argument_group( "Arguments related to `realdice' randomsource", ) diff --git a/diceware/config.py b/diceware/config.py index cac452eed83031d3c4d38ca4b2fe69baf1bdf021..0c4e274cb6362942aecf0ebbf04170ca313df672 100644 --- a/diceware/config.py +++ b/diceware/config.py @@ -33,7 +33,7 @@ OPTIONS_DEFAULTS = dict( delimiter="", randomsource="system", verbose=0, - wordlist="en_securedrop", + wordlist="en_eff", dice_sides=6, ) diff --git a/tests/exp_help_output.txt b/tests/exp_help_output.txt index 4d2ae6f0e7894b8a364b500906d730affb33be30..a04dc981422af060c8ddd78ca00a2bcb618eed54 100644 --- a/tests/exp_help_output.txt +++ b/tests/exp_help_output.txt @@ -22,8 +22,7 @@ optional arguments: -w NAME, --wordlist NAME Use words from this wordlist. Possible values: `en', `en_eff', `en_orig', `en_securedrop'. Wordlists are - stored in the folder displayed below. Default: - en_securedrop + stored in the folder displayed below. Default: en_eff -v, --verbose Be verbose. Use several times for increased verbosity. --version output version information and exit. diff --git a/tests/test_diceware.py b/tests/test_diceware.py index 85e372329c59457965d0d0d960640462bd2c7a08..245423432d903afba1bb4f481ea62d7ac6b7eed9 100644 --- a/tests/test_diceware.py +++ b/tests/test_diceware.py @@ -42,7 +42,7 @@ class TestHandleOptions(object): assert options.version is False assert options.delimiter == "" assert options.randomsource == "system" - assert options.wordlist == "en_securedrop" + assert options.wordlist == "en_eff" assert options.verbose == 0 def test_handle_options_infile(self, tmpdir):