Merge pull request #1 from azureswastika/fix

Fix dash bug
tdeni · Nov 30, 2020 · 5222e5f · 5222e5f
2 parents 4a9c55f + 87efda0
commit 5222e5f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/myconfig/__init__.py b/myconfig/__init__.py
@@ -1,4 +1,4 @@
 from .cli import main
 from .main import MyConfig
 
-__version__ = '0.2.2'
+__version__ = '0.2.3'
diff --git a/myconfig/main.py b/myconfig/main.py
@@ -33,6 +33,9 @@ def parser(files: list = None) -> dict:
         dict: Parsed data.
     '''
     data = dict()
+    if ENV.exists():
+        env_data = env_parse(ENV)
+        data.update(env_data)
     if files:
         for i, file in enumerate(files):
             files[i] = str(DIR.joinpath(file))
@@ -56,9 +59,14 @@ def parser(files: list = None) -> dict:
                     'File not found. ' +
                     'Specify the correct path to the file: {}'.format(
                         file.split('\\')[-1]))
-    if ENV.exists():
-        env_data = env_parse(ENV)
-        data.update(env_data)
+    _ = [dict(), list()]
+    for key in data:
+        if '-' in key:
+            _[1].append(key)
+            _[0].update({key.replace('-', '_'): data[key]})
+    data.update(_[0])
+    for item in _[1]:
+        data.pop(item)
     return data