Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the py35 issue with json not accepting bytestrings #387

Merged

Conversation

ajkavanagh
Copy link
Collaborator

So Python 3.6+ is magic, in that it will accept any str type
(str or bytes) in the json.loads() method. Unfortunately, xenial
(py35) doesn't have this feature. This patch correctly handles the
check_output output for the enabled_manager_modules() function.

So Python 3.6+ is magic, in that it will accept any str type
(str or bytes) in the json.loads() method.  Unfortunately, xenial
(py35) doesn't have this feature.  This patch correctly handles the
check_output output for the enabled_manager_modules() function.
Copy link
Contributor

@gnuoy gnuoy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@gnuoy gnuoy merged commit 62eb4ce into juju:master Oct 14, 2019
@ajkavanagh ajkavanagh deleted the fix-py35-json-ceph-enabled_manager_modules branch October 14, 2019 18:26
openstack-gerrit pushed a commit to openstack/charm-ceph-proxy that referenced this pull request Oct 15, 2019
Also clean up pre-existing pep8 violations in the
files/* dir which was previously not covered by lint testing.

Also clean-up mocking issues around apt-pkg replacements in the
unit tests.

Also fix py35 issue with enabled_manager_modules() function in the
charmhelpers library (see
juju/charm-helpers#387).

Also fix the functional tests bundles so they actually test the
version of OpenStack that the bundle indicates.

Change-Id: I2c8d84fadc11311c622dd308c4694496872dc157
openstack-gerrit pushed a commit to openstack/openstack that referenced this pull request Oct 15, 2019
* Update charm-ceph-proxy from branch 'master'
  - Sync charm/ceph helpers, tox, and requirements
    
    Also clean up pre-existing pep8 violations in the
    files/* dir which was previously not covered by lint testing.
    
    Also clean-up mocking issues around apt-pkg replacements in the
    unit tests.
    
    Also fix py35 issue with enabled_manager_modules() function in the
    charmhelpers library (see
    juju/charm-helpers#387).
    
    Also fix the functional tests bundles so they actually test the
    version of OpenStack that the bundle indicates.
    
    Change-Id: I2c8d84fadc11311c622dd308c4694496872dc157
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants