holm/podman-compose
1
0
Fork 0
forked from extern/podman-compose
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix running under python 3

Browse Source 
This is by no means extensive. It just fixes the errors I got when running `build` and `up`.

- Check for `__iter__` after checking for `isinstance(..., str)`
  `__iter__` is present on `str` in python 3
- coerce `dict.values()` to a list before sorting it
  python 3 introduces `dict_values`, which is closer to being an iterable, and so does not have `.sort`
This commit is contained in:
Anthony King 2019-05-05 12:33:07 +01:00 committed by GitHub
parent 337f3e9e2b
commit 34469eaed8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
podman-compose.py
View File

@ -63,8 +63,6 @@ def rec_subs(value, dicts):
""" """
if hasattr(value, "items"): if hasattr(value, "items"):
value = dict([(k, rec_subs(v, dicts)) for k, v in value.items()]) value = dict([(k, rec_subs(v, dicts)) for k, v in value.items()])
elif hasattr(value, "__iter__"):
value = [rec_subs(i, dicts) for i in value]
elif isinstance(value, basestring): elif isinstance(value, basestring):
value = var_re.sub(lambda m: dicts_get(dicts, m.group(1).strip('{}')), value) value = var_re.sub(lambda m: dicts_get(dicts, m.group(1).strip('{}')), value)
sub_def = lambda m: dicts_get(dicts, m.group(1), m.group(3), m.group(2) == ':') sub_def = lambda m: dicts_get(dicts, m.group(1), m.group(3), m.group(2) == ':')
@ -73,6 +71,8 @@ def rec_subs(value, dicts):
m.group(2) == ':') m.group(2) == ':')
value = var_err_re.sub(sub_err, value) value = var_err_re.sub(sub_err, value)
value = value.replace('$$', '$') value = value.replace('$$', '$')
elif hasattr(value, "__iter__"):
value = [rec_subs(i, dicts) for i in value]
return value return value
@ -520,7 +520,7 @@ def run_compose(
container_by_name = dict([(c["name"], c) for c in given_containers]) container_by_name = dict([(c["name"], c) for c in given_containers])
flat_deps(container_names_by_service, container_by_name) flat_deps(container_names_by_service, container_by_name)
#print("deps:", [(c["name"], c["_deps"]) for c in given_containers]) #print("deps:", [(c["name"], c["_deps"]) for c in given_containers])
given_containers = container_by_name.values() given_containers = list(container_by_name.values())
given_containers.sort(key=lambda c: len(c.get('_deps') or [])) given_containers.sort(key=lambda c: len(c.get('_deps') or []))
#print("sorted:", [c["name"] for c in given_containers]) #print("sorted:", [c["name"] for c in given_containers])
tr = transformations[transform_policy] tr = transformations[transform_policy]