From 95d2cddf1794646cfaf7a415b6e3ae92d6019664 Mon Sep 17 00:00:00 2001
From: Tim Van Baak <tim.vanbaak@gmail.com>
Date: Mon, 22 Apr 2019 14:14:59 -0700
Subject: [PATCH] Adjust paths for package org

---
 lexipython/__main__.py           | 6 +++---
 lexipython/article.py            | 2 +-
 lexipython/build.py              | 4 ++--
 lexipython/resources/__init__.py | 0
 lexipython/utils.py              | 6 ++++--
 5 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100644 lexipython/resources/__init__.py

diff --git a/lexipython/__main__.py b/lexipython/__main__.py
index 89ebfe6..d866e79 100644
--- a/lexipython/__main__.py
+++ b/lexipython/__main__.py
@@ -8,9 +8,9 @@ import argparse
 import os
 import re
 import json
-from src.article import LexiconArticle
-from src import build
-from src import utils
+from article import LexiconArticle
+import build
+import utils
 
 def is_lexicon(name):
 	"""
diff --git a/lexipython/article.py b/lexipython/article.py
index 6df114d..3b645b8 100644
--- a/lexipython/article.py
+++ b/lexipython/article.py
@@ -1,7 +1,7 @@
 import os
 import sys
 import re
-import src.utils as utils
+import utils
 
 class LexiconCitation:
 	"""
diff --git a/lexipython/build.py b/lexipython/build.py
index 9d155e2..75903d0 100644
--- a/lexipython/build.py
+++ b/lexipython/build.py
@@ -5,8 +5,8 @@ import io		# For writing pages out as UTF-8
 import networkx # For pagerank analytics
 from collections import defaultdict # For rank inversion in statistics
 
-from src import utils
-from src.article import LexiconArticle
+import utils
+from article import LexiconArticle
 
 class LexiconPage:
 	"""
diff --git a/lexipython/resources/__init__.py b/lexipython/resources/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/lexipython/utils.py b/lexipython/utils.py
index 9d2ea2c..2bc2e7b 100644
--- a/lexipython/utils.py
+++ b/lexipython/utils.py
@@ -1,6 +1,7 @@
 import os
 import re
 from urllib import parse
+import pkg_resources
 
 # Short utility functions for handling titles
 
@@ -37,8 +38,9 @@ def titlesort(s):
 def load_resource(filename, cache={}):
 	"""Loads files from the resources directory with caching."""
 	if filename not in cache:
-		with open(os.path.join("src", "resources", filename), "r", encoding="utf-8") as f:
-			cache[filename] = f.read()
+		binary = pkg_resources.resource_string("resources", filename)
+		unistr = binary.decode("utf-8")
+		cache[filename] = unistr
 	return cache[filename]
 
 def load_config(name):