From dfb6f54d78a93567374c0edc44f975b321dfdebc Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@lanl.gov>
Date: Thu, 2 Feb 2017 11:34:57 -0700
Subject: [PATCH] Incorporate pat suggestions

---
 tools/devel-server.py |  2 +-
 tools/moth.py         | 37 ++++++++++++++++++++++---------------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/tools/devel-server.py b/tools/devel-server.py
index a21df69..f7a9157 100755
--- a/tools/devel-server.py
+++ b/tools/devel-server.py
@@ -151,7 +151,7 @@ you are a fool.
             # List all point values in a category
             title = "Puzzles in category `{}`".format(parts[2])
             body.write("<ul>")
-            for points in cat.pointvals:
+            for points in cat.pointvals():
                 body.write('<li><a href="/puzzles/{cat}/{points}/">puzzles/{cat}/{points}/</a></li>'.format(cat=parts[2], points=points))
             body.write("</ul>")
         elif len(parts) == 4:
diff --git a/tools/moth.py b/tools/moth.py
index c6e4436..cfa7067 100644
--- a/tools/moth.py
+++ b/tools/moth.py
@@ -29,6 +29,13 @@ def pushd(newdir):
     finally:
         os.chdir(curdir)
 
+
+def loadmod(name, path):
+    abspath = os.path.abspath(path)
+    loader = importlib.machinery.SourceFileLoader(name, abspath)
+    return loader.load_module()
+
+
 # Get a big list of clean words for our answer file.
 ANSWER_WORDS = [w.strip() for w in open(os.path.join(os.path.dirname(__file__),
                                                      'answer_words.txt'))]
@@ -112,9 +119,7 @@ class Puzzle:
 
     def read_directory(self, path):
         try:
-            fn = os.path.abspath(os.path.join(path, "puzzle.py"))
-            loader = importlib.machinery.SourceFileLoader('puzzle_mod', fn)
-            puzzle_mod = loader.load_module()
+            puzzle_mod = loadmod("puzzle", os.path.join(path, "puzzle.py"))
         except FileNotFoundError:
             puzzle_mod = None
 
@@ -255,22 +260,24 @@ class Category:
     def __init__(self, path, seed):
         self.path = path
         self.seed = seed
-        self.pointvals = []
         self.catmod = None
 
-        if os.path.exists(os.path.join(path, 'category.py')):
-            with pushd(path):
-                fn = os.path.abspath('category.py')
-                loader = importlib.machinery.SourceFileLoader('category', fn)
-                self.catmod = loader.load_module()
-                self.pointvals.extend(self.catmod.pointvals())
+        try:
+            self.catmod = loadmod('category', os.path.join(path, 'category.py'))
+        except FileNotFoundError:
+            self.catmod = None
+
+    def pointvals(self):
+        if self.catmod:
+            with pushd(self.path):
+                pointvals = self.catmod.pointvals()
         else:
-            for fpath in glob.glob(os.path.join(path, "[0-9]*")):
+            pointvals = []
+            for fpath in glob.glob(os.path.join(self.path, "[0-9]*")):
                 pn = os.path.basename(fpath)
                 points = int(pn)
-                self.pointvals.append(points)
-
-        self.pointvals.sort()
+                pointvals.append(points)
+        return sorted(pointvals)
 
     def puzzle(self, points):
         puzzle = Puzzle(self.seed, points)
@@ -283,5 +290,5 @@ class Category:
         return puzzle
 
     def __iter__(self):
-        for points in self.pointvals:
+        for points in self.pointvals():
             yield self.puzzle(points)