Skip to content

Commit 6fbfe3b

Browse files
committed
resolve circular import
1 parent 8cbb27d commit 6fbfe3b

1 file changed

Lines changed: 3 additions & 9 deletions

File tree

cterasdk/settings.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,16 @@
33
from pathlib import Path
44
import yaml
55
from .convert import fromjsonstr
6-
from .lib.storage import commonfs
76

87

98
logger = logging.getLogger('cterasdk')
109

1110

1211
settings = Path(__file__).parent.absolute().joinpath('settings.yml')
1312
try:
14-
commonfs.properties(settings)
13+
with open(settings, 'r', encoding='utf-8') as f:
14+
settings = fromjsonstr(json.dumps(yaml.safe_load(f)))
15+
core, edge, drive, io, audit = settings.core, settings.edge, settings.drive, settings.io, settings.audit
1516
except FileNotFoundError:
1617
logger.fatal("Configuration file 'settings.yml' not found. Please check your installation and try again.")
1718
raise
18-
19-
20-
with open(settings, 'r', encoding='utf-8') as f:
21-
settings = fromjsonstr(json.dumps(yaml.safe_load(f)))
22-
23-
24-
core, edge, drive, io, audit = settings.core, settings.edge, settings.drive, settings.io, settings.audit

0 commit comments

Comments
 (0)