From 5368a8fb50429ac67d5684c192cf97851440ab70 Mon Sep 17 00:00:00 2001
From: ulif <uli@gnufix.de>
Date: Thu, 12 May 2016 10:04:12 +0200
Subject: [PATCH] Move `--dice-sides` option to main.
---
diceware/__init__.py | 7 +++++++
tests/exp_help_output.txt | 7 ++++---
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/diceware/__init__.py b/diceware/__init__.py
index 8df4fcd..1cef01a 100644
--- a/diceware/__init__.py
+++ b/diceware/__init__.py
@@ -116,6 +116,13 @@ def handle_options(args):
"Use words from this wordlist. Possible values: `%s'. "
"Wordlists are stored in the folder displayed below. "
"Default: en_securedrop" % "', `".join(wordlist_names)))
+ realdice_group = parser.add_argument_group(
+ "Arguments related to `realdice' randomsource",
+ )
+ realdice_group.add_argument(
+ '--dice-sides', default=6, type=int, metavar="N",
+ help='Number of sides of dice. Default: 6'
+ )
parser.add_argument(
'infile', nargs='?', metavar='INFILE', default=None,
type=argparse.FileType('r'),
diff --git a/tests/exp_help_output.txt b/tests/exp_help_output.txt
index 08a6462..cfeef5c 100644
--- a/tests/exp_help_output.txt
+++ b/tests/exp_help_output.txt
@@ -1,5 +1,5 @@
usage: diceware [-h] [-n NUM] [-c | --no-caps] [-s NUM] [-d DELIMITER]
- [-r SOURCE] [-w NAME] [-v] [--version] [--dice-sides N]
+ [-r SOURCE] [-w NAME] [--dice-sides N] [-v] [--version]
[INFILE]
Create a passphrase
@@ -25,7 +25,8 @@ optional arguments:
the folder displayed below. Default: en_securedrop
-v, --verbose Be verbose. Use several times for increased verbosity.
--version output version information and exit.
- --dice-sides N Number of sides of dice when using ``realdice`` as
- `randomsource`. Default: 6
+
+Arguments related to `realdice' randomsource:
+ --dice-sides N Number of sides of dice. Default: 6
Wordlists are stored in <WORDLISTS-DIR>
--
GitLab