Split and move trieregex.py to own folder, update import order

tests/test_add.py

@@ -1,6 +1,7 @@
-from trieregex.trieregex import TrieRegEx as TRE
 import unittest
 
+from trieregex import TrieRegEx as TRE
+
 
 class TestAdd(unittest.TestCase):
     """Tests for TrieRegEx().add()

tests/test_finals.py

@@ -1,7 +1,8 @@
-from trieregex.trieregex import TrieRegEx as TRE
 import unittest
 from collections import defaultdict
 
+from trieregex import TrieRegEx as TRE
+
 
 class TestFinals(unittest.TestCase):
     """Tests for TrieRegEx().finals() and TrieRegEx()._finals

tests/test_has.py

@@ -1,6 +1,7 @@
-from trieregex.trieregex import TrieRegEx as TRE
 import unittest
 
+from trieregex import TrieRegEx as TRE
+
 
 class TestHas(unittest.TestCase):
     """Tests for TrieRegEx().has()

tests/test_initials.py

@@ -1,7 +1,8 @@
-from trieregex.trieregex import TrieRegEx as TRE
 import unittest
 from collections import defaultdict
 
+from trieregex import TrieRegEx as TRE
+
 
 class TestInitials(unittest.TestCase):
     """Tests for TrieRegEx().initials() and TrieRegEx()._initials

tests/test_regex.py

@@ -1,7 +1,8 @@
-from trieregex.trieregex import TrieRegEx as TRE
-import unittest
 import re
 from typing import List
+import unittest
+
+from trieregex import TrieRegEx as TRE
 
 
 class TestRegex(unittest.TestCase):

tests/test_remove.py

@@ -1,6 +1,7 @@
-from trieregex.trieregex import TrieRegEx as TRE
 import unittest
 
+from trieregex import TrieRegEx as TRE
+
 
 class TestRemove(unittest.TestCase):
     """Tests for TrieRegEx().remove()

tests/test_trieregex.py

@@ -1,6 +1,7 @@
-from trieregex.trieregex import TrieRegEx as TRE
 import unittest
 
+from trieregex import TrieRegEx as TRE
+
 
 class TestTrieRegEx(unittest.TestCase):
     """Basic tests for each function in the trieregex.TrieRegEx class. 
@@ -28,6 +29,7 @@ def test_add(self):
         )
 
     def test_remove(self):
+        self.tre = TRE(*self.words)
         self.tre.remove('healthy', 'change')
         self.assertEqual(
             self.tre._trie,

trieregex/__init__.py

@@ -0,0 +1 @@
+from .trieregex import TrieRegEx

trieregex/memoizer.py

@@ -0,0 +1,23 @@
+from functools import partial
+
+
+class Memoizer:
+    __slots__ = ['func', 'cache']
+
+    def __init__(self, func):
+        self.func = func
+        self.cache = {}
+
+    def __call__(self, *args):
+        stringed = str(args)
+        if stringed not in self.cache:
+            self.cache[stringed] = self.func(*args)
+        return self.cache[stringed]
+
+    def __get__(self, obj, objtype):
+          fn = partial(self.__call__, obj)
+          fn.clear_cache = self._clear_cache
+          return fn
+
+    def _clear_cache(self):
+        self.cache.clear()

trieregex.py → trieregex/trieregex.py

@@ -1,29 +1,8 @@
-from re import escape
 from collections import defaultdict
+from re import escape
 from typing import Dict, List
-from functools import partial
-
-
-class Memoizer:
-    __slots__ = ['func', 'cache']
-
-    def __init__(self, func):
-        self.func = func
-        self.cache = {}
-
-    def __call__(self, *args):
-        stringed = str(args)
-        if stringed not in self.cache:
-            self.cache[stringed] = self.func(*args)
-        return self.cache[stringed]
-
-    def __get__(self, obj, objtype):
-          fn = partial(self.__call__, obj)
-          fn.clear_cache = self._clear_cache
-          return fn
 
-    def _clear_cache(self):
-        self.cache.clear()
+from .memoizer import Memoizer
 
 
 class TrieRegEx():