Skip to content

Commit 48ad40b

Browse files
committed
Simplify get_verify
1 parent 761ef2e commit 48ad40b

File tree

1 file changed

+16
-15
lines changed

1 file changed

+16
-15
lines changed

channelfinder/ChannelFinderClient.py

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
from requests.adapters import HTTPAdapter
1414
from requests.exceptions import HTTPError
1515
from copy import copy
16+
from typing import Optional
1617

1718
try:
1819
from json import JSONEncoder
@@ -53,21 +54,7 @@ def __init__(self, BaseURL=None, username=None, password=None, verify=None):
5354
self.__auth = None
5455
self.__session = requests.Session()
5556
self.__session.mount(self.__baseURL, HTTPAdapter())
56-
if verify is not None:
57-
self.__session.verify = verify
58-
else:
59-
verify_str = self.__getDefaultConfig("verify", None)
60-
if verify_str is None:
61-
self.__session.verify = True
62-
elif verify_str.lower() in ("1", "true", "on", "yes"):
63-
self.__session.verify = verify = True
64-
elif verify_str.lower() in ("0", "false", "off", "no"):
65-
self.__session.verify = verify = False
66-
else:
67-
# The verify option can also be a path to the trust store, so
68-
# if it does not match any of the special strings, we assume
69-
# that the string should be used as-is.
70-
self.__session.verify = verify_str
57+
self.__verify = self._get_boolean_config("verify", verify)
7158

7259
def __getDefaultConfig(self, key, override):
7360
"""
@@ -83,6 +70,20 @@ def __getDefaultConfig(self, key, override):
8370
result = basecfg["DEFAULT"].get(key, None)
8471
return result
8572

73+
def _get_boolean_config(self, key: str, override: Optional[bool]) -> bool:
74+
"""
75+
Get boolean configuration for given name and section.
76+
77+
:param key: key word
78+
:param override: override value
79+
:return: ``override`` if not ``None``, else the configuration value
80+
associated with ``key`` if present, otherwise ``None``.
81+
"""
82+
result = override
83+
if override is None:
84+
result = basecfg["DEFAULT"].getboolean(key, None)
85+
return bool(result)
86+
8687
def set(self, **kwds):
8788
"""
8889
method to allow various types of set operations on one or many channels, tags or properties

0 commit comments

Comments
 (0)