From 0a261a1d99377c026f636fa61da0736dae43f776 Mon Sep 17 00:00:00 2001
From: ulif <uli@gnufix.de>
Date: Sat, 18 Feb 2017 04:08:14 +0100
Subject: [PATCH] Make `en_eff` the default wordlist. Fixes #33.
The EFF list is currently certainly the scientifically most advanced
list. Thanks to @anarcat for proposing this switch! The securedrop
list is still available.
---
diceware/__init__.py | 4 ++--
diceware/config.py | 2 +-
tests/exp_help_output.txt | 3 +--
tests/test_diceware.py | 2 +-
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/diceware/__init__.py b/diceware/__init__.py
index af0a84d..4122193 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 cac452e..0c4e274 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 4d2ae6f..a04dc98 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 85e3723..2454234 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):
--
GitLab