GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-12-25 04:02:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into devel

Browse Source 
Conflicts:
	docs/technical/channel-modes.csv
	docs/technical/user-modes.csv
	protocols/hybrid.py
This commit is contained in:
James Lu 2017-08-31 15:18:38 -07:00
commit 0ea35dab18
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf.py
View File

@ -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. # Note: store globally the last loaded conf filename, for REHASH in coremods/control.
fname = filename fname = filename
# For the internal config name, strip off any .yml extensions and absolute paths # 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: try:
with open(filename, 'r') as f: with open(filename, 'r') as f:
conf = yaml.load(f) conf = yaml.load(f)