diff options
| author | Jeff Peeler <jpeeler@redhat.com> | 2017-05-12 18:51:26 -0400 |
|---|---|---|
| committer | Jeff Peeler <jpeeler@redhat.com> | 2017-05-13 11:04:39 -0400 |
| commit | 7fb814d6197c581b0dfcc974a5b0a4646eab6cea (patch) | |
| tree | 9eb2c59ef857a51ebafdef32f4cf9317246d86c0 | |
| parent | 56cc912451a9da3cb603db85edb01fb2d8d92ac8 (diff) | |
| download | openshift-7fb814d6197c581b0dfcc974a5b0a4646eab6cea.tar.gz openshift-7fb814d6197c581b0dfcc974a5b0a4646eab6cea.tar.bz2 openshift-7fb814d6197c581b0dfcc974a5b0a4646eab6cea.tar.xz openshift-7fb814d6197c581b0dfcc974a5b0a4646eab6cea.zip | |
Fix python3 error in repoquery
Explicitly convert from bytes to string so that splitting the string is
successful. This change works with python 2 as well.
Closes #4182
| -rw-r--r-- | roles/lib_utils/library/repoquery.py | 2 | ||||
| -rw-r--r-- | roles/lib_utils/src/class/repoquery.py | 2 | ||||
| -rwxr-xr-x | roles/lib_utils/src/test/unit/test_repoquery.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/roles/lib_utils/library/repoquery.py b/roles/lib_utils/library/repoquery.py index cf33e48d5..95a305b58 100644 --- a/roles/lib_utils/library/repoquery.py +++ b/roles/lib_utils/library/repoquery.py @@ -465,7 +465,7 @@ class Repoquery(RepoqueryCLI): version_dict = defaultdict(dict) - for version in query_output.split('\n'): + for version in query_output.decode().split('\n'): pkg_info = version.split("|") pkg_version = {} diff --git a/roles/lib_utils/src/class/repoquery.py b/roles/lib_utils/src/class/repoquery.py index 28e3a3e89..e997780ad 100644 --- a/roles/lib_utils/src/class/repoquery.py +++ b/roles/lib_utils/src/class/repoquery.py @@ -48,7 +48,7 @@ class Repoquery(RepoqueryCLI): version_dict = defaultdict(dict) - for version in query_output.split('\n'): + for version in query_output.decode().split('\n'): pkg_info = version.split("|") pkg_version = {} diff --git a/roles/lib_utils/src/test/unit/test_repoquery.py b/roles/lib_utils/src/test/unit/test_repoquery.py index 9991ecd14..325f41dab 100755 --- a/roles/lib_utils/src/test/unit/test_repoquery.py +++ b/roles/lib_utils/src/test/unit/test_repoquery.py @@ -45,7 +45,7 @@ class RepoQueryTest(unittest.TestCase): # Return values of our mocked function call. These get returned once per call. mock_cmd.side_effect = [ - (0, '4.2.46|21.el7_3|x86_64|rhel-7-server-rpms|4.2.46-21.el7_3', valid_stderr), # first call to the mock + (0, b'4.2.46|21.el7_3|x86_64|rhel-7-server-rpms|4.2.46-21.el7_3', valid_stderr), # first call to the mock ] # Act |