files restructured to be module-friendly.

yoiwa · Oct 2, 2018 · 8aa0231 · 8aa0231
1 parent 68f6c2d
commit 8aa0231
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 1 deletion.
diff --git a/make-password b/make-password
@@ -0,0 +1,3 @@
+#!/usr/bin/env python3
+import password_generator
+password_generator.main()
diff --git a/password_generator/__init__.py b/password_generator/__init__.py
@@ -0,0 +1 @@
+from .password_generator import *
diff --git a/corpus/Makefile → password_generator/corpus/Makefile b/corpus/Makefile → password_generator/corpus/Makefile
diff --git a/corpus/basic_english.corpus → ...ord_generator/corpus/basic_english.corpus b/corpus/basic_english.corpus → ...ord_generator/corpus/basic_english.corpus
diff --git a/corpus/gutenberg10k.corpus → ...word_generator/corpus/gutenberg10k.corpus b/corpus/gutenberg10k.corpus → ...word_generator/corpus/gutenberg10k.corpus
diff --git a/corpus/jwikipedia10k.corpus → ...ord_generator/corpus/jwikipedia10k.corpus b/corpus/jwikipedia10k.corpus → ...ord_generator/corpus/jwikipedia10k.corpus
diff --git a/corpus/jwikipedia10k.corpus-kakasi → ...erator/corpus/jwikipedia10k.corpus-kakasi b/corpus/jwikipedia10k.corpus-kakasi → ...erator/corpus/jwikipedia10k.corpus-kakasi
diff --git a/corpus/more_basic_english.corpus → ...enerator/corpus/more_basic_english.corpus b/corpus/more_basic_english.corpus → ...enerator/corpus/more_basic_english.corpus
diff --git a/make-password.py → password_generator/password_generator.py b/make-password.py → password_generator/password_generator.py
@@ -508,13 +508,18 @@ class Wordlist:
         "basicenglish": BasicEnglish
     }
 
+    base_path = None
     @classmethod
     def load_wordlist(self, target):
         if target in self.mapping:
             target = self.mapping[target]
         if target in self.corpus:
             return self.corpus[target]
-        fname = "corpus/" + target + ".corpus"
+
+        if not self.base_path:
+            from pathlib import Path
+            self.base_path = Path(sys.modules[self.__module__].__file__).parent / 'corpus'
+        fname = str(self.base_path / (target + ".corpus"))
         no_apostroph = False
         try:
             with open(fname, 'r') as f: