Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert pypofile try block move

Browse source 
Config file getting is allowed to fail. I didn't realize that it
would not just use the default instead of excepting and getting
caught. Sorry for that.
This commit is contained in:
Lucas Bickel 2017-10-15 13:14:40 +02:00
parent 38fe253438
commit 4287ac1c70
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
python_apps/pypo/pypo/pypofile.py
View file

@ -61,11 +61,11 @@ class PypoFile(Thread):
self.logger.info("copying from %s to local cache %s" % (src, dst)) self.logger.info("copying from %s to local cache %s" % (src, dst))
CONFIG_SECTION = "general" CONFIG_SECTION = "general"
username = self._config.get(CONFIG_SECTION, 'api_key')
baseurl = self._config.get(CONFIG_SECTION, 'base_url')
port = self._config.get(CONFIG_SECTION, 'base_port', 80)
protocol = self._config.get(CONFIG_SECTION, 'protocol', str(("http", "https")[int(port) == 443]))
try: try:
username = self._config.get(CONFIG_SECTION, 'api_key')
baseurl = self._config.get(CONFIG_SECTION, 'base_url')
port = self._config.get(CONFIG_SECTION, 'base_port', 80)
protocol = self._config.get(CONFIG_SECTION, 'protocol', str(("http", "https")[int(port) == 443]))
host = [protocol, baseurl, port] host = [protocol, baseurl, port]
url = "%s://%s:%s/rest/media/%s/download" % (host[0], url = "%s://%s:%s/rest/media/%s/download" % (host[0],