jinql
/
12306
mirror of https://github.com/testerSunshine/12306
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #271 from taochenlove/master 

fix warning:YAMLLoadWarning: calling yaml.load() without Loader=... i…
pull/251/merge
wenxianping 2019-06-11 19:51:27 +08:00 committed by GitHub
parent 1f503cb2d9 a3bdb1c96c
commit 6fa4020593
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/ticketConf.py
View File

@ -14,10 +14,10 @@ def _get_yaml():
path = os.path.join(os.path.dirname(__file__) + '/ticket_config.yaml') path = os.path.join(os.path.dirname(__file__) + '/ticket_config.yaml')
try: # 兼容2和3版本 try: # 兼容2和3版本
with open(path, encoding="utf-8") as f: with open(path, encoding="utf-8") as f:
s = yaml.load(f) s = yaml.load(f, Loader=yaml.FullLoader)
except Exception: except Exception:
with open(path) as f: with open(path) as f:
s = yaml.load(f) s = yaml.load(f, Loader=yaml.FullLoader)
return s.decode() if isinstance(s, bytes) else s return s.decode() if isinstance(s, bytes) else s