Replace basestring with six.string_types
https://wiki.openstack.org/wiki/Python3 Change-Id: I02d3cad58031400af66c1a4eca1e9f3ac669463f
This commit is contained in:
parent
71929e87b8
commit
4e7cb91a0d
|
@ -20,6 +20,7 @@ from monasca_common.validation import metrics as metric_validation
|
|||
from oslo_config import cfg
|
||||
from oslo_log import log
|
||||
import pyparsing
|
||||
import six
|
||||
|
||||
from monasca_api.api import alarm_definitions_api_v2
|
||||
from monasca_api.common.repositories import exceptions
|
||||
|
@ -96,7 +97,7 @@ class AlarmDefinitions(alarm_definitions_api_v2.AlarmDefinitionsV2API,
|
|||
severity = severity.upper()
|
||||
sort_by = helpers.get_query_param(req, 'sort_by', default_val=None)
|
||||
if sort_by is not None:
|
||||
if isinstance(sort_by, basestring):
|
||||
if isinstance(sort_by, six.string_types):
|
||||
sort_by = sort_by.split(',')
|
||||
|
||||
allowed_sort_by = {'id', 'name', 'severity',
|
||||
|
|
|
@ -18,6 +18,7 @@ import falcon
|
|||
from monasca_common.simport import simport
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log
|
||||
import six
|
||||
|
||||
from monasca_api.api import alarms_api_v2
|
||||
from monasca_api.common.repositories import exceptions
|
||||
|
@ -126,7 +127,7 @@ class Alarms(alarms_api_v2.AlarmsV2API,
|
|||
query_parms['severity'] = query_parms['severity'].upper()
|
||||
|
||||
if 'sort_by' in query_parms:
|
||||
if isinstance(query_parms['sort_by'], basestring):
|
||||
if isinstance(query_parms['sort_by'], six.string_types):
|
||||
query_parms['sort_by'] = query_parms['sort_by'].split(',')
|
||||
|
||||
allowed_sort_by = {'alarm_id', 'alarm_definition_id', 'alarm_definition_name',
|
||||
|
|
|
@ -169,7 +169,7 @@ def get_query_dimensions(req, param_key='dimensions'):
|
|||
return dimensions
|
||||
|
||||
dimensions_param = params[param_key]
|
||||
if isinstance(dimensions_param, basestring):
|
||||
if isinstance(dimensions_param, six.string_types):
|
||||
dimensions_str_array = dimensions_param.split(',')
|
||||
elif isinstance(dimensions_param, list):
|
||||
dimensions_str_array = []
|
||||
|
|
|
@ -16,6 +16,7 @@ import falcon
|
|||
from monasca_common.simport import simport
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log
|
||||
import six
|
||||
|
||||
from monasca_api.api import notifications_api_v2
|
||||
from monasca_api.common.repositories import exceptions
|
||||
|
@ -209,7 +210,7 @@ class Notifications(notifications_api_v2.NotificationsV2API):
|
|||
self._get_notifications_authorized_roles)
|
||||
sort_by = helpers.get_query_param(req, 'sort_by', default_val=None)
|
||||
if sort_by is not None:
|
||||
if isinstance(sort_by, basestring):
|
||||
if isinstance(sort_by, six.string_types):
|
||||
sort_by = sort_by.split(',')
|
||||
|
||||
allowed_sort_by = {'id', 'name', 'type', 'address',
|
||||
|
|
Loading…
Reference in New Issue