Drop six.
Charm-helpers dropped py2 support, hence charms are in the process of dropping support for it too, this change drops the use of the `six` library. Change-Id: I4c76e60780e7dc1189a9fad8f8caf34c3fad5f65
This commit is contained in:
parent
8125a7baec
commit
5451d82104
|
@ -14,7 +14,6 @@
|
|||
import hashlib
|
||||
import ipaddress
|
||||
import json
|
||||
from six import string_types
|
||||
|
||||
|
||||
class ResourceManagement():
|
||||
|
@ -415,7 +414,7 @@ class CRM(dict):
|
|||
|
||||
def _parse(self, prefix, data):
|
||||
results = ''
|
||||
if isinstance(data, string_types):
|
||||
if isinstance(data, str):
|
||||
data = [data]
|
||||
|
||||
first = True
|
||||
|
@ -740,7 +739,7 @@ class CRM(dict):
|
|||
# format the spec string with the attributes
|
||||
if 'attributes' in kwargs:
|
||||
attrs = kwargs['attributes']
|
||||
if isinstance(attrs, string_types):
|
||||
if isinstance(attrs, str):
|
||||
attrs = [attrs]
|
||||
specs = specs + (' %s' % ' '.join(attrs))
|
||||
|
||||
|
|
Loading…
Reference in New Issue