Finish move of source.

diceware.py

@@ -62,7 +62,8 @@ def get_wordlist_path(lang):
     if not RE_LANG_CODE.match(lang):
         raise ValueError("Not a valid language code: %s" % lang)
     basename = 'wordlist_%s.txt' % lang
-    return os.path.abspath(os.path.join(SRC_DIR, basename.lower()))
+    return os.path.abspath(os.path.join(
+        SRC_DIR, 'wordlists', basename.lower()))
 
 
 def insert_special_char(word, specials=SPECIAL_CHARS, rnd=None):

setup.cfg

@@ -6,4 +6,4 @@ docs = develop easy_install diceware[docs]
 [pytest]
 addopts = --doctest-modules
           --doctest-glob='*.rst'
-          tests docs README.rst diceware
+          tests docs README.rst diceware.py

setup.py

@@ -40,7 +40,7 @@ setup(
     license="GPL 3.0",
     keywords="diceware password passphrase",
     url="https://github.com/ulif/diceware/",
-    packages=['diceware'],
+    packages=[],
     package_data={
         'diceware': ['*.txt', '*.asc'],
         },
@@ -76,7 +76,7 @@ setup(
     cmdclass={'test': PyTest},
     entry_points={
         'console_scripts': [
-            'diceware = diceware.diceware:main',
+            'diceware = diceware:main',
         ]
         }
 )

tests/test_diceware.py

 import os
 import pytest
 import sys
-from diceware.diceware import (
+from diceware import (
     SRC_DIR, RE_LANG_CODE, SPECIAL_CHARS, get_wordlist, get_wordlist_path,
     insert_special_char, get_passphrase, handle_options, main,
     )
@@ -33,7 +33,7 @@ class Test_GetWordList(object):
 
     def test_get_wordlist_en(self):
         # we can get a list of words out of english wordlist.
-        en_src = os.path.join(SRC_DIR, 'wordlist_en.txt')
+        en_src = os.path.join(SRC_DIR, 'wordlists', 'wordlist_en.txt')
         en_result = get_wordlist(en_src)
         assert en_result[0] == 'a'
         assert en_result[-1] == '@'