Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix port and protocol default values 

Turns our bare ConfigObjects don't to default passing very automatically.
This commit is contained in:
Lucas Bickel 2017-10-15 13:46:40 +02:00
parent 4287ac1c70
commit ace7e493f4
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
python_apps/pypo/pypo/pypofile.py
View File

@ -63,8 +63,12 @@ class PypoFile(Thread):
CONFIG_SECTION = "general" CONFIG_SECTION = "general"
username = self._config.get(CONFIG_SECTION, 'api_key') username = self._config.get(CONFIG_SECTION, 'api_key')
baseurl = self._config.get(CONFIG_SECTION, 'base_url') baseurl = self._config.get(CONFIG_SECTION, 'base_url')
port = self._config.get(CONFIG_SECTION, 'base_port', 80) port = self._config.get(CONFIG_SECTION, 'base_port')
protocol = self._config.get(CONFIG_SECTION, 'protocol', str(("http", "https")[int(port) == 443])) if not port:
port = 80
protocol = self._config.get(CONFIG_SECTION, 'protocol')
if not protocol:
protocol = str(("http", "https")[int(port) == 443])
try: try:
host = [protocol, baseurl, port] host = [protocol, baseurl, port]
@ -162,7 +166,7 @@ class PypoFile(Thread):
def read_config_file(self, config_path): def read_config_file(self, config_path):
"""Parse the application's config file located at config_path.""" """Parse the application's config file located at config_path."""
config = ConfigParser.SafeConfigParser() config = ConfigParser.SafeConfigParser(allow_no_value=True)
try: try:
config.readfp(open(config_path)) config.readfp(open(config_path))
except IOError as e: except IOError as e: