afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'rel/5.2' into core-rest-flask

Browse source
This commit is contained in:
Blake J. Harnden 2018-08-16 16:54:54 -07:00
commit 3e02503c5b
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
daemon/core/misc/utils.py
View file

@ -132,7 +132,11 @@ def make_tuple_fromstr(s, value_type):
:rtype: tuple :rtype: tuple
""" """
# remove tuple braces and strip commands and space from all values in the tuple string # remove tuple braces and strip commands and space from all values in the tuple string
values = [x.strip("' ") for x in s.strip("(), ").split(",")] values = []
for x in s.strip("(), ").split(","):
x = x.strip("' ")
if x:
values.append(x)
return tuple(value_type(i) for i in values) return tuple(value_type(i) for i in values)

2
daemon/core/xml/corexml.py
View file

@ -764,7 +764,7 @@ class CoreXmlReader(object):
directory_elements = service_configuration.find("directories") directory_elements = service_configuration.find("directories")
if directory_elements is not None: if directory_elements is not None:
service.directories = tuple(x.text for x in directory_elements.iterchildren()) service.dirs = tuple(x.text for x in directory_elements.iterchildren())
startup_elements = service_configuration.find("startups") startup_elements = service_configuration.find("startups")
if startup_elements is not None: if startup_elements is not None: