read settings major fix

Stake-And-Rope · Jul 25, 2023 · 1b1cee8 · 1b1cee8
1 parent e78d8f7
commit 1b1cee8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/settings/__pycache__/__init__.cpython-310.pyc b/settings/__pycache__/__init__.cpython-310.pyc
diff --git a/settings/__pycache__/settings_handler.cpython-310.pyc b/settings/__pycache__/settings_handler.cpython-310.pyc
diff --git a/settings/settings.json → settings/game_settings.json b/settings/settings.json → settings/game_settings.json
diff --git a/settings/settings_handler.py b/settings/settings_handler.py
@@ -1,11 +1,11 @@
-from json import (load,
-                  dump,
-                  )
+#!/usr/bin/python3
+
+import json
 
 
 def read_file(filename):
     with open(filename, "r") as file:
-        return load(file)
+        return json.load(file)
 
 
 # def save_file(filename):
@@ -17,14 +17,14 @@ def get_plane_settings():
     """
     :return:  dictionary with the plane settings
     """
-    return read_file("planes_settings.json")
+    pass
 
 
-def get_game_settings():
+def get_game_settings(file):
     """
     :return: dictionary with the game settings
     """
-    return read_file("settings.json")
+    return read_file(file)
 
 
 def overwrite_game_settings(**kwargs):
@@ -33,8 +33,6 @@ def overwrite_game_settings(**kwargs):
 
 
 
-
-
 # def overwrite_settings(self, **kwargs):
 #     kwargs = {k.lower(): v for k, v in kwargs.items()}
 #