diff --git a/diceware/wordlist.py b/diceware/wordlist.py index 7dabbb501320b9812c1412eb40fdc6ffac8126b3..b3fa1749065b4de3eb9c93ed928fa62bf2c840f9 100644 --- a/diceware/wordlist.py +++ b/diceware/wordlist.py @@ -29,6 +29,12 @@ RE_WORDLIST_NAME = re.compile('^[a-zA-Z0-9_-]+$') #: A regular expression matching numbered entries in wordlists. RE_NUMBERED_WORDLIST_ENTRY = re.compile('^[0-9]+\s+([^\s]+)$') +# A workaround to avoid `six` dependency. +try: + basestring +except NameError: # NOQA # pragma: no cover + basestring = str + def get_wordlist_names(): """Get a all names of wordlists stored locally. @@ -133,11 +139,6 @@ def get_wordlist_path(name): basename = 'wordlist_%s.txt' % name return os.path.join(WORDLISTS_DIR, basename) -try: - basestring -except NameError: - basestring = str - class WordList(object): """A word list contains words for building passphrases.