paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 22:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

zulip_tools: Unify get_config and get_config_bool using overloads.

Browse Source
This commit is contained in:
Alex Vandiver
2024-03-05 16:16:31 +00:00
committed by Tim Abbott
parent 0ff1fb2e21
commit f9f9392b93
4 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
scripts/lib/zulip_tools.py
View File

@@ -16,7 +16,7 @@ import sys
import time
import uuid
from datetime import datetime, timedelta
from typing import IO, Any, Dict, List, Sequence, Set
from typing import IO, Any, Dict, List, Sequence, Set, Union, overload
from urllib.parse import SplitResult
DEPLOYMENTS_DIR = "/home/zulip/deployments"
@@ -583,24 +583,26 @@ def assert_running_as_root(strip_lib_from_paths: bool = False) -> None:
sys.exit(1)
@overload
def get_config(
config_file: configparser.RawConfigParser, section: str, key: str, default_value: str = ""
) -> str: ...
@overload
def get_config(
config_file: configparser.RawConfigParser, section: str, key: str, default_value: bool
) -> bool: ...
def get_config(
config_file: configparser.RawConfigParser,
section: str,
key: str,
default_value: str = "",
) -> str:
if config_file.has_option(section, key):
return config_file.get(section, key)
return default_value
def get_config_bool(
config_file: configparser.RawConfigParser, section: str, key: str, default_value: bool = False
) -> bool:
default_value: Union[str, bool] = "",
) -> Union[str, bool]:
if config_file.has_option(section, key):
val = config_file.get(section, key)
# This list is parallel to puppet/zulip/lib/puppet/functions/zulipconf.rb
return val.lower() in ["1", "y", "t", "true", "yes", "enable", "enabled"]
if isinstance(default_value, bool):
# This list is parallel to puppet/zulip/lib/puppet/functions/zulipconf.rb
return val.lower() in ["1", "y", "t", "true", "yes", "enable", "enabled"]
return val
return default_value