~gagbo/diceware.py

d6e9eefbce8ebe437e4317318483431afe5615ae — Gerry Agbobada 2 years ago 91f221a
Refactor code to add pyflakes and pylint to CI

Now there is more information displayed
9 files changed, 660 insertions(+), 67 deletions(-)

A .flake8
M .gitlab-ci.yml
A .pylintrc
M dice_rolls/__init__.py
M dice_rolls/diceware_result.py
M diceware.py
A requirements-dev.txt
D requirements.txt
M tests/test_dice_rolls.py
A .flake8 => .flake8 +5 -0
@@ 0,0 1,5 @@
[flake8]
ignore = E203, E266, E501, W503
max-line-length = 80
max-complexity = 18
select = B,C,E,F,W,T4,B9

M .gitlab-ci.yml => .gitlab-ci.yml +4 -2
@@ 2,5 2,7 @@ test:
  script:
  - apt-get update -qy
  - apt-get install -y python3-dev python3-pip
  - pip3 install -r requirements.txt
  - python3 -m pytest tests/*.py -vv
  - pip3 install -r requirements-dev.txt
  - python3 -m pytest -vv
  - pyflakes .
  - python3 -m pylint diceware --exit-zero

A .pylintrc => .pylintrc +565 -0
@@ 0,0 1,565 @@
[MASTER]

# A comma-separated list of package or module names from where C extensions may
# be loaded. Extensions are loading into the active Python interpreter and may
# run arbitrary code.
extension-pkg-whitelist=

# Add files or directories to the blacklist. They should be base names, not
# paths.
ignore=CVS

# Add files or directories matching the regex patterns to the blacklist. The
# regex matches against base names, not paths.
ignore-patterns=

# Python code to execute, usually for sys.path manipulation such as
# pygtk.require().
#init-hook=

# Use multiple processes to speed up Pylint. Specifying 0 will auto-detect the
# number of processors available to use.
jobs=1

# Control the amount of potential inferred values when inferring a single
# object. This can help the performance when dealing with large functions or
# complex, nested conditions.
limit-inference-results=100

# List of plugins (as comma separated values of python modules names) to load,
# usually to register additional checkers.
load-plugins=

# Pickle collected data for later comparisons.
persistent=yes

# Specify a configuration file.
#rcfile=

# When enabled, pylint would attempt to guess common misconfiguration and emit
# user-friendly hints instead of false-positive error messages.
suggestion-mode=yes

# Allow loading of arbitrary C extensions. Extensions are imported into the
# active Python interpreter and may run arbitrary code.
unsafe-load-any-extension=no


[MESSAGES CONTROL]

# Only show warnings with the listed confidence levels. Leave empty to show
# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED.
confidence=

# Disable the message, report, category or checker with the given id(s). You
# can either give multiple identifiers separated by comma (,) or put this
# option multiple times (only on the command line, not in the configuration
# file where it should appear only once). You can also use "--disable=all" to
# disable everything first and then reenable specific checks. For example, if
# you want to run only the similarities checker, you can use "--disable=all
# --enable=similarities". If you want to run only the classes checker, but have
# no Warning level messages displayed, use "--disable=all --enable=classes
# --disable=W".
disable=print-statement,
        parameter-unpacking,
        unpacking-in-except,
        old-raise-syntax,
        backtick,
        long-suffix,
        old-ne-operator,
        old-octal-literal,
        import-star-module-level,
        non-ascii-bytes-literal,
        raw-checker-failed,
        bad-inline-option,
        locally-disabled,
        locally-enabled,
        file-ignored,
        suppressed-message,
        useless-suppression,
        deprecated-pragma,
        use-symbolic-message-instead,
        apply-builtin,
        basestring-builtin,
        buffer-builtin,
        cmp-builtin,
        coerce-builtin,
        execfile-builtin,
        file-builtin,
        long-builtin,
        raw_input-builtin,
        reduce-builtin,
        standarderror-builtin,
        unicode-builtin,
        xrange-builtin,
        coerce-method,
        delslice-method,
        getslice-method,
        setslice-method,
        no-absolute-import,
        old-division,
        dict-iter-method,
        dict-view-method,
        next-method-called,
        metaclass-assignment,
        indexing-exception,
        raising-string,
        reload-builtin,
        oct-method,
        hex-method,
        nonzero-method,
        cmp-method,
        input-builtin,
        round-builtin,
        intern-builtin,
        unichr-builtin,
        map-builtin-not-iterating,
        zip-builtin-not-iterating,
        range-builtin-not-iterating,
        filter-builtin-not-iterating,
        using-cmp-argument,
        eq-without-hash,
        div-method,
        idiv-method,
        rdiv-method,
        exception-message-attribute,
        invalid-str-codec,
        sys-max-int,
        bad-python3-import,
        deprecated-string-function,
        deprecated-str-translate-call,
        deprecated-itertools-function,
        deprecated-types-field,
        next-method-defined,
        dict-items-not-iterating,
        dict-keys-not-iterating,
        dict-values-not-iterating,
        deprecated-operator-function,
        deprecated-urllib-function,
        xreadlines-attribute,
        deprecated-sys-function,
        exception-escape,
        comprehension-escape

# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
# multiple time (only on the command line, not in the configuration file where
# it should appear only once). See also the "--disable" option for examples.
enable=c-extension-no-member


[REPORTS]

# Python expression which should return a note less than 10 (10 is the highest
# note). You have access to the variables errors warning, statement which
# respectively contain the number of errors / warnings messages and the total
# number of statements analyzed. This is used by the global evaluation report
# (RP0004).
evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)

# Template used to display messages. This is a python new-style format string
# used to format the message information. See doc for all details.
#msg-template=

# Set the output format. Available formats are text, parseable, colorized, json
# and msvs (visual studio). You can also give a reporter class, e.g.
# mypackage.mymodule.MyReporterClass.
output-format=text

# Tells whether to display a full report or only the messages.
reports=no

# Activate the evaluation score.
score=yes


[REFACTORING]

# Maximum number of nested blocks for function / method body
max-nested-blocks=5

# Complete name of functions that never returns. When checking for
# inconsistent-return-statements if a never returning function is called then
# it will be considered as an explicit return statement and no message will be
# printed.
never-returning-functions=sys.exit


[MISCELLANEOUS]

# List of note tags to take in consideration, separated by a comma.
notes=FIXME,
      XXX,
      TODO


[BASIC]

# Naming style matching correct argument names.
argument-naming-style=snake_case

# Regular expression matching correct argument names. Overrides argument-
# naming-style.
#argument-rgx=

# Naming style matching correct attribute names.
attr-naming-style=snake_case

# Regular expression matching correct attribute names. Overrides attr-naming-
# style.
#attr-rgx=

# Bad variable names which should always be refused, separated by a comma.
bad-names=foo,
          bar,
          baz,
          toto,
          tutu,
          tata

# Naming style matching correct class attribute names.
class-attribute-naming-style=any

# Regular expression matching correct class attribute names. Overrides class-
# attribute-naming-style.
#class-attribute-rgx=

# Naming style matching correct class names.
class-naming-style=PascalCase

# Regular expression matching correct class names. Overrides class-naming-
# style.
#class-rgx=

# Naming style matching correct constant names.
const-naming-style=UPPER_CASE

# Regular expression matching correct constant names. Overrides const-naming-
# style.
#const-rgx=

# Minimum line length for functions/classes that require docstrings, shorter
# ones are exempt.
docstring-min-length=-1

# Naming style matching correct function names.
function-naming-style=snake_case

# Regular expression matching correct function names. Overrides function-
# naming-style.
#function-rgx=

# Good variable names which should always be accepted, separated by a comma.
good-names=i,
           j,
           k,
           ex,
           Run,
           _

# Include a hint for the correct naming format with invalid-name.
include-naming-hint=no

# Naming style matching correct inline iteration names.
inlinevar-naming-style=any

# Regular expression matching correct inline iteration names. Overrides
# inlinevar-naming-style.
#inlinevar-rgx=

# Naming style matching correct method names.
method-naming-style=snake_case

# Regular expression matching correct method names. Overrides method-naming-
# style.
#method-rgx=

# Naming style matching correct module names.
module-naming-style=snake_case

# Regular expression matching correct module names. Overrides module-naming-
# style.
#module-rgx=

# Colon-delimited sets of names that determine each other's naming style when
# the name regexes allow several styles.
name-group=

# Regular expression which should only match function or class names that do
# not require a docstring.
no-docstring-rgx=^_

# List of decorators that produce properties, such as abc.abstractproperty. Add
# to this list to register other decorators that produce valid properties.
# These decorators are taken in consideration only for invalid-name.
property-classes=abc.abstractproperty

# Naming style matching correct variable names.
variable-naming-style=snake_case

# Regular expression matching correct variable names. Overrides variable-
# naming-style.
#variable-rgx=


[LOGGING]

# Logging modules to check that the string format arguments are in logging
# function parameter format.
logging-modules=logging


[TYPECHECK]

# List of decorators that produce context managers, such as
# contextlib.contextmanager. Add to this list to register other decorators that
# produce valid context managers.
contextmanager-decorators=contextlib.contextmanager

# List of members which are set dynamically and missed by pylint inference
# system, and so shouldn't trigger E1101 when accessed. Python regular
# expressions are accepted.
generated-members=

# Tells whether missing members accessed in mixin class should be ignored. A
# mixin class is detected if its name ends with "mixin" (case insensitive).
ignore-mixin-members=yes

# Tells whether to warn about missing members when the owner of the attribute
# is inferred to be None.
ignore-none=yes

# This flag controls whether pylint should warn about no-member and similar
# checks whenever an opaque object is returned when inferring. The inference
# can return multiple potential results while evaluating a Python object, but
# some branches might not be evaluated, which results in partial inference. In
# that case, it might be useful to still emit no-member and other checks for
# the rest of the inferred objects.
ignore-on-opaque-inference=yes

# List of class names for which member attributes should not be checked (useful
# for classes with dynamically set attributes). This supports the use of
# qualified names.
ignored-classes=optparse.Values,thread._local,_thread._local

# List of module names for which member attributes should not be checked
# (useful for modules/projects where namespaces are manipulated during runtime
# and thus existing member attributes cannot be deduced by static analysis. It
# supports qualified module names, as well as Unix pattern matching.
ignored-modules=

# Show a hint with possible names when a member name was not found. The aspect
# of finding the hint is based on edit distance.
missing-member-hint=yes

# The minimum edit distance a name should have in order to be considered a
# similar match for a missing member name.
missing-member-hint-distance=1

# The total number of similar names that should be taken in consideration when
# showing a hint for a missing member.
missing-member-max-choices=1


[FORMAT]

# Expected format of line ending, e.g. empty (any line ending), LF or CRLF.
expected-line-ending-format=

# Regexp for a line that is allowed to be longer than the limit.
ignore-long-lines=^\s*(# )?<?https?://\S+>?$

# Number of spaces of indent required inside a hanging  or continued line.
indent-after-paren=4

# String used as indentation unit. This is usually "    " (4 spaces) or "\t" (1
# tab).
indent-string='    '

# Maximum number of characters on a single line.
max-line-length=100

# Maximum number of lines in a module.
max-module-lines=1000

# List of optional constructs for which whitespace checking is disabled. `dict-
# separator` is used to allow tabulation in dicts, etc.: {1  : 1,\n222: 2}.
# `trailing-comma` allows a space between comma and closing bracket: (a, ).
# `empty-line` allows space-only lines.
no-space-check=trailing-comma,
               dict-separator

# Allow the body of a class to be on the same line as the declaration if body
# contains single statement.
single-line-class-stmt=no

# Allow the body of an if to be on the same line as the test if there is no
# else.
single-line-if-stmt=no


[VARIABLES]

# List of additional names supposed to be defined in builtins. Remember that
# you should avoid to define new builtins when possible.
additional-builtins=

# Tells whether unused global variables should be treated as a violation.
allow-global-unused-variables=yes

# List of strings which can identify a callback function by name. A callback
# name must start or end with one of those strings.
callbacks=cb_,
          _cb

# A regular expression matching the name of dummy variables (i.e. expected to
# not be used).
dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_

# Argument names that match this expression will be ignored. Default to name
# with leading underscore.
ignored-argument-names=_.*|^ignored_|^unused_

# Tells whether we should check for unused import in __init__ files.
init-import=no

# List of qualified module names which can have objects that can redefine
# builtins.
redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io


[SIMILARITIES]

# Ignore comments when computing similarities.
ignore-comments=yes

# Ignore docstrings when computing similarities.
ignore-docstrings=yes

# Ignore imports when computing similarities.
ignore-imports=no

# Minimum lines number of a similarity.
min-similarity-lines=4


[SPELLING]

# Limits count of emitted suggestions for spelling mistakes.
max-spelling-suggestions=4

# Spelling dictionary name. Available dictionaries: fr_MC (myspell), en_SG
# (myspell), en_ZW (myspell), en_BZ (myspell), fr_BE (myspell), en_GH
# (myspell), en_AG (myspell), en_ZM (myspell), en_NZ (myspell), en_ZA
# (myspell), en_NG (myspell), en_DK (myspell), en_BW (myspell), en_IE
# (myspell), en_BS (myspell), en_GB (myspell), fr_CA (myspell), en_MW
# (myspell), fr_LU (myspell), fr_FR (myspell), en_CA (myspell), en_IN
# (myspell), en_NA (myspell), en_PH (myspell), en_HK (myspell), fr_CH
# (myspell), en_US (myspell), en_JM (myspell), en_AU (myspell), en_TT
# (myspell)..
spelling-dict=

# List of comma separated words that should not be checked.
spelling-ignore-words=

# A path to a file that contains private dictionary; one word per line.
spelling-private-dict-file=

# Tells whether to store unknown words to indicated private dictionary in
# --spelling-private-dict-file option instead of raising a message.
spelling-store-unknown-words=no


[CLASSES]

# List of method names used to declare (i.e. assign) instance attributes.
defining-attr-methods=__init__,
                      __new__,
                      setUp

# List of member names, which should be excluded from the protected access
# warning.
exclude-protected=_asdict,
                  _fields,
                  _replace,
                  _source,
                  _make

# List of valid names for the first argument in a class method.
valid-classmethod-first-arg=cls

# List of valid names for the first argument in a metaclass class method.
valid-metaclass-classmethod-first-arg=cls


[DESIGN]

# Maximum number of arguments for function / method.
max-args=5

# Maximum number of attributes for a class (see R0902).
max-attributes=7

# Maximum number of boolean expressions in an if statement.
max-bool-expr=5

# Maximum number of branch for function / method body.
max-branches=12

# Maximum number of locals for function / method body.
max-locals=15

# Maximum number of parents for a class (see R0901).
max-parents=7

# Maximum number of public methods for a class (see R0904).
max-public-methods=20

# Maximum number of return / yield for function / method body.
max-returns=6

# Maximum number of statements in function / method body.
max-statements=50

# Minimum number of public methods for a class (see R0903).
min-public-methods=2


[IMPORTS]

# Allow wildcard imports from modules that define __all__.
allow-wildcard-with-all=no

# Analyse import fallback blocks. This can be used to support both Python 2 and
# 3 compatible code, which means that the block might have code that exists
# only in one or another interpreter, leading to false positives when analysed.
analyse-fallback-blocks=no

# Deprecated modules which should not be used, separated by a comma.
deprecated-modules=optparse,tkinter.tix

# Create a graph of external dependencies in the given file (report RP0402 must
# not be disabled).
ext-import-graph=

# Create a graph of every (i.e. internal and external) dependencies in the
# given file (report RP0402 must not be disabled).
import-graph=

# Create a graph of internal dependencies in the given file (report RP0402 must
# not be disabled).
int-import-graph=

# Force import order to recognize a module as part of the standard
# compatibility libraries.
known-standard-library=

# Force import order to recognize a module as part of a third party library.
known-third-party=enchant


[EXCEPTIONS]

# Exceptions that will emit a warning when being caught. Defaults to
# "Exception".
overgeneral-exceptions=Exception

M dice_rolls/__init__.py => dice_rolls/__init__.py +2 -0
@@ 1,5 1,7 @@
#!/usr/bin/env python3
# coding: utf-8
"""Importing the dice_rolls module will seed the pseudo random number generator
with datetime.now(), just in case."""
import datetime
import random


M dice_rolls/diceware_result.py => dice_rolls/diceware_result.py +48 -39
@@ 14,15 14,18 @@ class DicewareResult:
        check up the words database.
    """

    def __init__(self, wordsCount=5, systemRand=True, bonusRoll=True):
    def __init__(self, words_count=5, system_rand=True, bonus_roll=True):
        """ Constructor of a Diceware Result
        wordsCount is the number of words in the passphrase
        systemRand asks to use system true random instead of pseudo-random
        bonusRoll asks for one more roll to salt the passphrase with a symbol
        words_count is the number of words in the passphrase
        system_rand asks to use system true random instead of pseudo-random
        bonus_roll asks for one more roll to salt the passphrase with a symbol
        """
        self.wordsCount = wordsCount
        self.systemRand = systemRand
        self.bonusRoll = bonusRoll
        self.words_count = words_count
        self.system_rand = system_rand
        self.bonus_roll = bonus_roll
        self.rolls = None
        self.salt = None
        self.random_generator = None

    def make_rolls(self):
        """ make_rolls fills self.rolls with dice throws


@@ 32,9 35,9 @@ class DicewareResult:
        self.rolls = self.generate_rolls()
        self.ensure_random_generator()

        if self.bonusRoll:
        if self.bonus_roll:
            self.salt = roll_5_dice(self.random_generator)
            while self.salt[0] > self.wordsCount:
            while self.salt[0] > self.words_count:
                self.salt = roll_5_dice(self.random_generator)
        else:
            self.salt = None


@@ 45,16 48,16 @@ class DicewareResult:
        self.ensure_random_generator()

        result = []
        for i in range(self.wordsCount):
        for _ in range(self.words_count):
            result.append(roll_5_dice(self.random_generator))
        return tuple(result)

    def ensure_random_generator(self):
        """ Create a random generator attribute if not created yet."""
        if hasattr(self, "random_generator"):
        if hasattr(self, "random_generator") and self.random_generator is not None:
            return

        if self.systemRand:
        if self.system_rand:
            self.random_generator = random.SystemRandom()
        else:
            self.random_generator = random.Random()


@@ 64,11 67,12 @@ class DicewareResult:
        Useful for debugging purposes
        """
        string = "Diceware Result : {} words with {} generator\n".format(
            self.wordsCount, "system" if self.systemRand else "pseudo")
        for i in range(self.wordsCount):
            self.words_count, "system" if self.system_rand else "pseudo"
        )
        for i in range(self.words_count):
            string += "Word {} : {}\n".format(i + 1, self.rolls[i])

        if self.bonusRoll:
        if self.bonus_roll:
            string += "Salt : {}\n".format(self.salt)

        return string[:-1]


@@ 79,8 83,9 @@ class DicewareResult:
        the words dictionary (Diceware list)
        """
        roll = self.rolls[i]
        result = (roll[0] * 10000 + roll[1] * 1000 +
                  roll[2] * 100 + roll[3] * 10 + roll[4])
        result = (
            roll[0] * 10000 + roll[1] * 1000 + roll[2] * 100 + roll[3] * 10 + roll[4]
        )
        return result

    def password_from_dict(self, diceware_dict):


@@ 89,21 94,21 @@ class DicewareResult:
        diceware_dict must be a dictionary indexed with integers representing
           the rolls concatenated
        """
        result = ''
        result = ""
        # Prepare salting the correct word if relevant
        if self.bonusRoll:
        if self.bonus_roll:
            target_word_index = self.salt[0] - 1

        for i in range(self.wordsCount):
        for i in range(self.words_count):
            new_word = list(diceware_dict[self.key_from_word(i)])
            # Salting
            if self.bonusRoll and i == target_word_index:
            if self.bonus_roll and i == target_word_index:
                target_char = min(self.salt[1], len(new_word))
                replace_char = get_salt_char(self.salt[2], self.salt[3])
                new_word[target_char - 1] = replace_char

            result += "".join(new_word)
            result += ' '
            result += " "
        result = result[:-1]
        return result



@@ 111,26 116,30 @@ class DicewareResult:
def roll_5_dice(gen):
    """ roll_5_dice generates a 5-uple of integers between 1 and 6 inclusive
    """
    return (gen.randint(1, 6),
            gen.randint(1, 6),
            gen.randint(1, 6),
            gen.randint(1, 6),
            gen.randint(1, 6))
    return (
        gen.randint(1, 6),
        gen.randint(1, 6),
        gen.randint(1, 6),
        gen.randint(1, 6),
        gen.randint(1, 6),
    )


def get_salt_char(digitThree=0, digitFour=0):
def get_salt_char(digit_three=0, digit_four=0):
    """ get_salt_char returns a char to use as additional char from salt
    It takes 2 digits in the range [1,6] as parameters digitThree digitFour.
    If these parameters are not given, then space is returned
    """
    if digitThree < 1 or digitFour < 1 or digitThree > 6 or digitFour > 6:
        return ' '

    symbol_table = (('~', '!', '#', '$', '%', '^'),
                    ('&', '*', '(', ')', '-', '='),
                    ('+', '[', ']', '\\', '{', '}'),
                    (':', ';', '"', '\'', '<', '>'),
                    ('?', '/', '0', '1', '2', '3'),
                    ('4', '5', '6', '7', '8', '9'))

    return symbol_table[digitFour - 1][digitThree - 1]
    if digit_three < 1 or digit_four < 1 or digit_three > 6 or digit_four > 6:
        return " "

    symbol_table = (
        ("~", "!", "#", "$", "%", "^"),
        ("&", "*", "(", ")", "-", "="),
        ("+", "[", "]", "\\", "{", "}"),
        (":", ";", '"', "'", "<", ">"),
        ("?", "/", "0", "1", "2", "3"),
        ("4", "5", "6", "7", "8", "9"),
    )

    return symbol_table[digit_four - 1][digit_three - 1]

M diceware.py => diceware.py +26 -18
@@ 5,11 5,11 @@
import argparse
import sys

import dice_dict.list_to_dict as list_to_dict
import dice_dict.list_to_dict as ltd
import dice_rolls.diceware_result as dw


def print_entropy_help(fileDesc):
def print_entropy_help(file_desc):
    """ print_entropy_help prints on fileDesc a remainder on word count
    """
    print(


@@ 20,7 20,7 @@ def print_entropy_help(fileDesc):
        "may be in the grasp of state-backed attacks\n"
        "   - 7 words is unbreakeable with current state of the art\n"
        "   - 8 words is safe for the times to come\n",
        file=fileDesc,
        file=file_desc,
    )




@@ 31,26 31,34 @@ def create_passphrase(**kwargs):
    return result


def parse_cli_arguments():
    """Return an argparse.Namespace with relevant command-line parsing."""
    parser = argparse.ArgumentParser()
    parser.add_argument("wordlist", default="data/diceware-fr-5-jets.txt")
    parser.add_argument("words_count", type=int)
    parser.add_argument(
        "--no-salt", dest="bonus_roll", action="store_false", default=True
    )
    parser.add_argument(
        "--no-crypto-rand", dest="system_rand", action="store_false", default=True
    )
    return parser.parse_args()


if __name__ == "__main__":
    print_entropy_help(sys.stderr)
    p = argparse.ArgumentParser()
    p.add_argument("wordlist", default="data/diceware-fr-5-jets.txt")
    p.add_argument("wordsCount", type=int)
    p.add_argument("--no-salt", dest="bonusRoll", action="store_false", default=True)
    p.add_argument(
        "--no-crypto-rand", dest="systemRand", action="store_false", default=True
    )
    args = p.parse_args()

    with open(args.wordlist, "r") as file_list:
        diceware_dict = list_to_dict.create_dictionary(file_list)
    ARGS = parse_cli_arguments()

    with open(ARGS.wordlist, "r") as file_list:
        DICEWARE_DICT = ltd.create_dictionary(file_list)

    # Remove the wordlist argument from the namespace, so vars(args)
    # is forwardable to the create_passphrase function, which has
    # the same interface as the DicewareResult constructor.
    vars(args).pop("wordlist", None)
    vars(ARGS).pop("wordlist", None)

    print("Generation parameters : {}".format(args), file=sys.stderr)
    test_value = create_passphrase(**vars(args))
    print(test_value, file=sys.stderr)
    print(test_value.password_from_dict(diceware_dict))
    print("Generation parameters : {}".format(ARGS), file=sys.stderr)
    TEST_VALUE = create_passphrase(**vars(ARGS))
    print(TEST_VALUE, file=sys.stderr)
    print(TEST_VALUE.password_from_dict(DICEWARE_DICT))

A requirements-dev.txt => requirements-dev.txt +4 -0
@@ 0,0 1,4 @@
pytest==3.9.3
flake8==3.7.7
pyflakes=2.1.0
pylint==2.1.1

D requirements.txt => requirements.txt +0 -1
@@ 1,1 0,0 @@
pytest==3.9.3

M tests/test_dice_rolls.py => tests/test_dice_rolls.py +6 -7
@@ 3,7 3,6 @@
import copy
import pytest
import re
import random

import dice_rolls.diceware_result as dw
import dice_dict.list_to_dict as ltd


@@ 17,7 16,7 @@ def bundled_dict():


def test_passphrase_stability(bundled_dict):
    result = dw.DicewareResult(wordsCount=5, systemRand=True, bonusRoll=True)
    result = dw.DicewareResult(words_count=5, system_rand=True, bonus_roll=True)
    result.make_rolls()
    passphrases = []
    passphrases.append(result.password_from_dict(bundled_dict))


@@ 29,10 28,10 @@ def test_passphrase_stability(bundled_dict):
    assert passphrases[1] != passphrases[2]


# TODO : make this a lambda to loop over wordsCount ? Or decorator ?
# TODO : make this a lambda to loop over words_count ? Or decorator ?
# Or multiple definitions?
def test_passphrase_wordcount(bundled_dict):
    result = dw.DicewareResult(wordsCount=5, systemRand=True, bonusRoll=True)
    result = dw.DicewareResult(words_count=5, system_rand=True, bonus_roll=True)
    result.make_rolls()
    passphrase = result.password_from_dict(bundled_dict)
    m = re.findall(" ", passphrase)


@@ 41,8 40,8 @@ def test_passphrase_wordcount(bundled_dict):


def test_salt():
    not_salted = dw.DicewareResult(wordsCount=2, systemRand=True, bonusRoll=False)
    salted = dw.DicewareResult(wordsCount=2, systemRand=True, bonusRoll=True)
    not_salted = dw.DicewareResult(words_count=2, system_rand=True, bonus_roll=False)
    salted = dw.DicewareResult(words_count=2, system_rand=True, bonus_roll=True)
    not_salted.make_rolls()
    salted.make_rolls()
    assert salted.salt is not None


@@ 51,7 50,7 @@ def test_salt():

def test_non_system_rand():
    stored_results = []
    result = dw.DicewareResult(wordsCount=5, systemRand=False, bonusRoll=True)
    result = dw.DicewareResult(words_count=5, system_rand=False, bonus_roll=True)

    result.ensure_random_generator()
    result.random_generator.seed(15)