From 8aa0231f7df43e472c011a7df9aaf7d4d9aefb56 Mon Sep 17 00:00:00 2001
From: Yutaka OIWA <y.oiwa@aist.go.jp>
Date: Wed, 3 Oct 2018 00:41:41 +0900
Subject: [PATCH] files restructured to be module-friendly.

---
 make-password                                              | 3 +++
 password_generator/__init__.py                             | 1 +
 {corpus => password_generator/corpus}/Makefile             | 0
 {corpus => password_generator/corpus}/basic_english.corpus | 0
 {corpus => password_generator/corpus}/gutenberg10k.corpus  | 0
 {corpus => password_generator/corpus}/jwikipedia10k.corpus | 0
 .../corpus}/jwikipedia10k.corpus-kakasi                    | 0
 .../corpus}/more_basic_english.corpus                      | 0
 .../password_generator.py                                  | 7 ++++++-
 9 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100755 make-password
 create mode 100644 password_generator/__init__.py
 rename {corpus => password_generator/corpus}/Makefile (100%)
 rename {corpus => password_generator/corpus}/basic_english.corpus (100%)
 rename {corpus => password_generator/corpus}/gutenberg10k.corpus (100%)
 rename {corpus => password_generator/corpus}/jwikipedia10k.corpus (100%)
 rename {corpus => password_generator/corpus}/jwikipedia10k.corpus-kakasi (100%)
 rename {corpus => password_generator/corpus}/more_basic_english.corpus (100%)
 rename make-password.py => password_generator/password_generator.py (99%)

diff --git a/make-password b/make-password
new file mode 100755
index 0000000..93b852c
--- /dev/null
+++ 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
new file mode 100644
index 0000000..7b7850d
--- /dev/null
+++ b/password_generator/__init__.py
@@ -0,0 +1 @@
+from .password_generator import *
diff --git a/corpus/Makefile b/password_generator/corpus/Makefile
similarity index 100%
rename from corpus/Makefile
rename to password_generator/corpus/Makefile
diff --git a/corpus/basic_english.corpus b/password_generator/corpus/basic_english.corpus
similarity index 100%
rename from corpus/basic_english.corpus
rename to password_generator/corpus/basic_english.corpus
diff --git a/corpus/gutenberg10k.corpus b/password_generator/corpus/gutenberg10k.corpus
similarity index 100%
rename from corpus/gutenberg10k.corpus
rename to password_generator/corpus/gutenberg10k.corpus
diff --git a/corpus/jwikipedia10k.corpus b/password_generator/corpus/jwikipedia10k.corpus
similarity index 100%
rename from corpus/jwikipedia10k.corpus
rename to password_generator/corpus/jwikipedia10k.corpus
diff --git a/corpus/jwikipedia10k.corpus-kakasi b/password_generator/corpus/jwikipedia10k.corpus-kakasi
similarity index 100%
rename from corpus/jwikipedia10k.corpus-kakasi
rename to password_generator/corpus/jwikipedia10k.corpus-kakasi
diff --git a/corpus/more_basic_english.corpus b/password_generator/corpus/more_basic_english.corpus
similarity index 100%
rename from corpus/more_basic_english.corpus
rename to password_generator/corpus/more_basic_english.corpus
diff --git a/make-password.py b/password_generator/password_generator.py
similarity index 99%
rename from make-password.py
rename to password_generator/password_generator.py
index 7a3ce8d..f6f1873 100755
--- a/make-password.py
+++ b/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: