diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2013-05-10 17:45:26 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2013-05-10 17:45:26 -0500 |
| commit | f2f26ff7561c66656e41cfced999701bc84c06c5 (patch) | |
| tree | 387c1a80549b33ba9c069ecdf2669dcfe41c41b7 /src | |
| parent | 03c72d7544f83c3c4e92867db3b05399a2daaa7e (diff) | |
| download | bcfg2-f2f26ff7561c66656e41cfced999701bc84c06c5.tar.gz bcfg2-f2f26ff7561c66656e41cfced999701bc84c06c5.tar.bz2 bcfg2-f2f26ff7561c66656e41cfced999701bc84c06c5.zip | |
Lint: py3k fix
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/Server/Lint/Validate.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Server/Lint/Validate.py b/src/lib/Bcfg2/Server/Lint/Validate.py index ae7c75804..91cfe2a56 100644 --- a/src/lib/Bcfg2/Server/Lint/Validate.py +++ b/src/lib/Bcfg2/Server/Lint/Validate.py @@ -121,6 +121,9 @@ class Validate(Bcfg2.Server.Lint.ServerlessPlugin): cmd.extend(["--noout", "--schema", schemafile, filename]) lint = Popen(cmd, stdout=PIPE, stderr=STDOUT) output = lint.communicate()[0] + # py3k fix + if not isinstance(output, str): + output = output.decode('utf-8') if lint.wait(): self.LintError("xml-failed-to-verify", "%s fails to verify:\n%s" % (filename, output)) |