Skip to content

Avoid tainting the default config #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −3
Open

Avoid tainting the default config #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ntfy/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from ruamel import yaml

from . import __version__
from .default_config import config as default_configuration
from .default_config import get_default_config

if yaml.version_info < (0, 15):
safe_load = yaml.safe_load
Expand All @@ -34,7 +34,7 @@ def load_config(config_path=DEFAULT_CONFIG):
except IOError as e:
if e.errno == errno.ENOENT and config_path == DEFAULT_CONFIG:
logger.info('{} not found'.format(config_path))
config = default_configuration
config = get_default_config()
else:
logger.error(
'Failed to open {}'.format(config_path), exc_info=True)
Expand Down
3 changes: 2 additions & 1 deletion ntfy/default_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
config = {}
def get_default_config():
return {}