Moved files into respective directories, minor file path and encoding compatibility changes

settings_manager.py → src/settings_manager.py

@@ -1,5 +1,5 @@
 import os, json
-from settings import settings
+from src.settings import settings
 
 class settings_manager (object):
     __settings = None
@@ -58,13 +58,12 @@ class settings_manager (object):
             FileNotFoundError: Ошибка при открытии файла
         """
 
-        file_path = os.path.split(__file__)
-        settings_file = "%s/%s" % (file_path[0], self.__filename)
+        settings_file = self.__filename
 
         if not os.path.exists(settings_file):
             raise FileNotFoundError("Невозможно загрузить файл настроек")
         
-        with open(settings_file, "r") as read_file:
+        with open(settings_file, "r", encoding="UTF-8") as read_file:
             self.__data = json.load(read_file)
         
         return True

test_settings.py → tests/test_settings.py

@@ -1,5 +1,5 @@
-from settings import settings
-from settings_manager import settings_manager
+from src.settings import settings
+from src.settings_manager import settings_manager
 import unittest, os, random
 
 
@@ -24,13 +24,13 @@ class test_settings(unittest.TestCase):
     #
     def test_check_settings_manager_singleton(self):
         # Подготовка
-        a = settings_manager()
-        b = settings_manager()
+        man1 = settings_manager()
+        man2 = settings_manager()
 
         # Действие
 
         # Проверка
-        assert a is b
+        assert man1 is man2
 
     
     #
@@ -38,10 +38,10 @@ class test_settings(unittest.TestCase):
     #
     def test_check_open_settings(self):
         # Подготовка
-        item = settings_manager()
+        man = settings_manager()
         
         # Действие
-        result = item.open("settings.json")
+        result = man.open(f"{os.curdir}/../cfg/settings.json")
 
         # Проверка
         assert result == True
@@ -56,7 +56,7 @@ class test_settings(unittest.TestCase):
         settings = None
 
         # Действие
-        man.open("settings.json")
+        man.open(f"{os.curdir}/../cfg/settings.json")
         man.convert()
         settings = man.settings
         dict = settings.__dict__
@@ -72,16 +72,17 @@ class test_settings(unittest.TestCase):
     #
     def test_settings_any_filename(self):
         # Подготовка
-        if not os.path.exists("./.test_data"):
-            os.mkdir("./.test_data")
+        if not os.path.exists("..\\.test_data"):
+            os.mkdir("..\\.test_data")
         alp = "abcdefghijklmnopqrstuvwxyz"
-        dirname = f"{os.curdir}/.test_data/"
+        dirname = f"{os.getcwd()}\\..\\.test_data\\"
         dirname += ''.join(random.choice(alp) for _ in range(6))
-        filename = f"{dirname}/"
+        filename = f"{dirname}\\"
         filename += ''.join(random.choice(alp) for _ in range(6)) + ".json"
         os.mkdir(dirname)
-        f = open(filename, "w")
-        f2 = open(f"{os.curdir}/settings.json")
+        print(filename)
+        f = open(filename, "w", encoding="UTF-8")
+        f2 = open(f"{os.getcwd()}\\cfg\\settings.json", encoding="UTF-8")
         f.write(f2.read())
         f.close()
         f2.close()