mirror of
https://github.com/jlu5/PyLink.git
synced 2024-12-24 11:42:51 +01:00
Merge branch 'master' into devel
Conflicts: docs/technical/channel-modes.csv docs/technical/user-modes.csv protocols/hybrid.py
This commit is contained in:
commit
0ea35dab18
2
conf.py
2
conf.py
@ -114,7 +114,7 @@ def loadConf(filename, errors_fatal=True, logger=None):
|
||||
# Note: store globally the last loaded conf filename, for REHASH in coremods/control.
|
||||
fname = filename
|
||||
# For the internal config name, strip off any .yml extensions and absolute paths
|
||||
confname = os.path.basename(filename).split('.', 1)[0]
|
||||
confname = os.path.splitext(os.path.basename(filename))[0]
|
||||
try:
|
||||
with open(filename, 'r') as f:
|
||||
conf = yaml.load(f)
|
||||
|
Loading…
Reference in New Issue
Block a user