refactored utils module

aseemsavio · Oct 22, 2022 · 2463d79 · 2463d79
1 parent 883ae23
commit 2463d79
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 39 deletions.
diff --git a/catholic/core/canon/__init__.py b/catholic/core/canon/__init__.py
@@ -2,4 +2,4 @@
     "execute_canon_command"
 ]
 
-from catholic.core.canon.canon_law import execute_canon_command
+from catholic.core.canon.canon_law import execute_canon_command
diff --git a/catholic/core/canon/canon_law.py b/catholic/core/canon/canon_law.py
@@ -1,7 +1,7 @@
 from catholic.core.canon.services import get_canon_law_by_id, get_canon_laws_with_given_substring, \
     get_canon_law_paragraphs_by_paragraph_ids
-from catholic.core.utils import load_pickle, error, markdown, blue_text, \
-    red_text
+from catholic.core.utils.files import load_pickle
+from catholic.core.utils.console import error, markdown, blue_text, red_text
 from catholic.core.utils.query import decode_query
 
 

diff --git a/catholic/core/canon/services.py b/catholic/core/canon/services.py
@@ -1,4 +1,4 @@
-from catholic.core.utils import string_contains
+from catholic.core.utils.strings import string_contains
 
 
 def get_canon_law_by_id(law_id: int, canon: list[dict]):

diff --git a/catholic/core/catechism/catechism.py b/catholic/core/catechism/catechism.py
@@ -1,7 +1,8 @@
-from catholic.core.catechism.services import get_catechism_by_paragraph, get_catechism_paragraphs_with_given_substring, \
-    get_catechism_paragraphs_by_paragraph_ids
-from catholic.core.utils import load_pickle, markdown, error, blue_text, \
-    red_text
+from catholic.core.catechism.services import get_catechism_by_paragraph, \
+    get_catechism_paragraphs_with_given_substring, get_catechism_paragraphs_by_paragraph_ids
+from catholic.core.utils.files import load_pickle
+from catholic.core.utils.console import markdown, error, blue_text, red_text
+
 from catholic.core.utils.query import decode_query
 
 

diff --git a/catholic/core/catechism/services.py b/catholic/core/catechism/services.py
@@ -1,4 +1,4 @@
-from catholic.core.utils import string_contains
+from catholic.core.utils.strings import string_contains
 
 
 def get_catechism_by_paragraph(paragraph_number: int, catechism: list[dict]):

diff --git a/catholic/core/missal/missal.py b/catholic/core/missal/missal.py
@@ -1,7 +1,7 @@
-from catholic.core.missal.services import get_roman_missal_by_number, get_roman_missal_paragraphs_with_given_substring, \
-    get_roman_missal_paragraphs_by_numbers
-from catholic.core.utils import load_pickle, markdown, error, blue_text, \
-    red_text
+from catholic.core.missal.services import get_roman_missal_by_number, \
+    get_roman_missal_paragraphs_with_given_substring, get_roman_missal_paragraphs_by_numbers
+from catholic.core.utils.files import load_pickle
+from catholic.core.utils.console import markdown, error, blue_text, red_text
 from catholic.core.utils.query import decode_query
 
 

diff --git a/catholic/core/missal/services.py b/catholic/core/missal/services.py
@@ -1,4 +1,4 @@
-from catholic.core.utils import string_contains
+from catholic.core.utils.strings import string_contains
 
 
 def get_roman_missal_by_number(missal_id: int, missal: list[dict]):

diff --git a/catholic/core/utils/__init__.py b/catholic/core/utils/__init__.py
@@ -1,18 +0,0 @@
-__all__ = [
-    "load_pickle",
-    "green_text",
-    "red_text",
-    "error",
-    "markdown",
-    "blue_text",
-    "remove_white_spaces",
-    "destructure_comma_separated_string",
-    "range_or_single_digit_list",
-    "range_string_to_int_list",
-    "get_uniques_as_sorted_list",
-    "string_contains"
-]
-
-from catholic.core.utils.display_utils import *
-from catholic.core.utils.file_utils import load_pickle
-from catholic.core.utils.string_utils import *

diff --git a/catholic/core/utils/display_utils.py → catholic/core/utils/console.py b/catholic/core/utils/display_utils.py → catholic/core/utils/console.py
diff --git a/catholic/core/utils/file_utils.py → catholic/core/utils/files.py b/catholic/core/utils/file_utils.py → catholic/core/utils/files.py
diff --git a/catholic/core/utils/query/query_decoding.py → catholic/core/utils/query.py b/catholic/core/utils/query/query_decoding.py → catholic/core/utils/query.py
@@ -1,5 +1,5 @@
-from catholic.core.utils import remove_white_spaces, destructure_comma_separated_string, range_or_single_digit_list, \
-    get_uniques_as_sorted_list
+from catholic.core.utils.strings import remove_white_spaces, destructure_comma_separated_string, \
+    range_or_single_digit_list, get_uniques_as_sorted_list
 
 
 def decode_query(query: str) -> list[int]:

diff --git a/catholic/core/utils/query/__init__.py b/catholic/core/utils/query/__init__.py
diff --git a/catholic/core/utils/string_utils.py → catholic/core/utils/strings.py b/catholic/core/utils/string_utils.py → catholic/core/utils/strings.py