openstack
/
charms.openstack
Code Issues Proposed changes

Drop use of tuple unpacking to fix Python 3.4 compability 

Use of Tuple unpacking in function arguments was not completely
generalized until PEP-448 [0] was implemented in Python 3.5.

Revert to using List instead until we the old snakes have retired.

0: https://www.python.org/dev/peps/pep-0448/

Change-Id: I4befe75d3a9f976bb32f49895833562bcf822c9c
Closes-Bug: #1883657
This commit is contained in:
Frode Nordahl 2020-06-16 09:17:19 +02:00
parent 2b143b9687
commit d0431be73d
No known key found for this signature in database
GPG Key ID: 6A5D59A3BA48373F
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
charms_openstack/plugins/classes.py
View File

@ -291,14 +291,13 @@ class CephCharm(charms_openstack.charm.OpenStackCharm,
:returns: Path to directory :returns: Path to directory
:rtype: str :rtype: str
""" """
keyring_path_components = ( keyring_path_components = [
self.snap_path_prefix, self.snap_path_prefix,
self.ceph_keyring_path_prefix, self.ceph_keyring_path_prefix,
self.ceph_service_name) self.ceph_service_name]
if self.ceph_service_type != self.CephServiceType.client: if self.ceph_service_type != self.CephServiceType.client:
keyring_path_components = ( keyring_path_components.append(
*keyring_path_components,
'{}-{}'.format(self.ceph_cluster_name, '{}-{}'.format(self.ceph_cluster_name,
self.hostname)) self.hostname))