diff --git a/caster/lib/settings.py b/caster/lib/settings.py index 36de284b0..a948e1489 100644 --- a/caster/lib/settings.py +++ b/caster/lib/settings.py @@ -7,7 +7,7 @@ import errno import _winreg -from tomlkit import dumps, parser +from tomlkit import dumps, parse SETTINGS = {} BASE_PATH = os.path.realpath(__file__).rsplit(os.path.sep + "lib", 1)[0].replace("\\", "/") @@ -44,7 +44,7 @@ def _validate_engine_path(): ''' if os.path.isfile(_SETTINGS_PATH): with io.open(_SETTINGS_PATH, "rt", encoding="utf-8") as toml_file: - data = parser(toml_file.read()) + data = parse(toml_file.read()) engine_path = data["paths"]["ENGINE_PATH"] if os.path.isfile(engine_path): return engine_path @@ -289,7 +289,7 @@ def _init(path): result = {} try: with io.open(path, "rt", encoding="utf-8") as f: - result = loads(f.read()) + result = parse(f.read()) except ValueError as e: print("\n\n" + repr(e) + " while loading settings file: " + path + "\n\n") print(sys.exc_info()) diff --git a/caster/lib/utilities.py b/caster/lib/utilities.py index 687bf5000..bde88f7ba 100644 --- a/caster/lib/utilities.py +++ b/caster/lib/utilities.py @@ -17,7 +17,7 @@ HKEY_CURRENT_USER, OpenKey, QueryValueEx) from dragonfly.windows.window import Window -from tomlkit import dumps, parser +from tomlkit import dumps, parse try: # Style C -- may be imported into Caster, or externally BASE_PATH = os.path.realpath(__file__).rsplit(os.path.sep + "caster", 1)[0] @@ -82,7 +82,7 @@ def load_toml_file(path): result = {} try: with io.open(path, "rt", encoding="utf-8") as f: - result = parser(f.read()) + result = parse(f.read()) except IOError as e: if e.errno == 2: # The file doesn't exist. save_toml_file(result, path) diff --git a/requirements.txt b/requirements.txt index 6d4b3e440..0bd49cd1e 100644 Binary files a/requirements.txt and b/requirements.txt differ